pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-05 17:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing invite failure messages

Browse Source
This commit is contained in:
hg 2020-05-24 14:55:27 -04:00
parent 39fad0c1a0
commit aee3e1084c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zone/expedition.cpp
View File

@ -883,19 +883,27 @@ void Expedition::DzAddPlayer(
return; return;
} }
bool invite_failed = false;
if (add_char_name.empty()) if (add_char_name.empty())
{ {
requester->MessageString(Chat::Red, DZADD_NOT_ONLINE, add_char_name.c_str()); requester->MessageString(Chat::Red, DZADD_NOT_ONLINE, add_char_name.c_str());
return; invite_failed = true;
}
else
{
// we can avoid checking online status in world if we trust member status accuracy
auto member_data = GetMemberData(add_char_name);
if (member_data.char_id != 0 && member_data.status != ExpeditionMemberStatus::Offline)
{
requester->MessageString(Chat::Red, DZADD_ALREADY_PART, add_char_name.c_str());
invite_failed = true;
}
} }
// live prioritizes the "not online" message before the "already a member" if (invite_failed)
// message but we can avoid checking world if we trust member status accuracy
// live sanitizes input except for "sending invite" and "not online" msgs
auto member_data = GetMemberData(add_char_name);
if (member_data.char_id != 0 && member_data.status != ExpeditionMemberStatus::Offline)
{ {
requester->MessageString(Chat::Red, DZADD_ALREADY_PART, add_char_name.c_str()); requester->MessageString(Chat::Red, DZADD_INVITE_FAIL, FormatName(add_char_name).c_str());
return; return;
} }
@ -1679,6 +1687,7 @@ void Expedition::HandleWorldMessage(ServerPacket* pack)
if (leader) if (leader)
{ {
leader->MessageString(Chat::Red, DZADD_NOT_ONLINE, FormatName(buf->target_name).c_str()); leader->MessageString(Chat::Red, DZADD_NOT_ONLINE, FormatName(buf->target_name).c_str());
leader->MessageString(Chat::Red, DZADD_INVITE_FAIL, FormatName(buf->target_name).c_str());
} }
} }
break; break;