EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure the client GetCurrentZone pointer is valid for SendFriendList and SendChatRelationship

Browse Source
This commit is contained in:
Emagi 2025-08-17 10:44:51 -04:00
parent c5e9adc069
commit 4e077ed3d8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/WorldServer/client.cpp
View File

@ -10736,7 +10736,7 @@ void Client::SendChatRelationship(int8 type, const char* name) {
if (type == 0) { if (type == 0) {
Client* client = zone_list.GetClientByCharName(name); Client* client = zone_list.GetClientByCharName(name);
if (client) { if (client) {
packet->setArrayDataByName("location", client->GetCurrentZone()->GetZoneName()); packet->setArrayDataByName("location", client->GetCurrentZone() ? client->GetCurrentZone()->GetZoneName() : "");
packet->setArrayDataByName("class_name", classes.GetClassName(client->GetPlayer()->GetAdventureClass())); packet->setArrayDataByName("class_name", classes.GetClassName(client->GetPlayer()->GetAdventureClass()));
} }
} }
@ -10765,7 +10765,7 @@ void Client::SendFriendList() {
client = zone_list.GetClientByCharName(names[i]); client = zone_list.GetClientByCharName(names[i]);
packet->setArrayDataByName("name", names[i].c_str(), i); packet->setArrayDataByName("name", names[i].c_str(), i);
if (client) { if (client) {
packet->setArrayDataByName("location", client->GetCurrentZone()->GetZoneName(), i); packet->setArrayDataByName("location", client->GetCurrentZone() ? client->GetCurrentZone()->GetZoneName() : "", i);
packet->setArrayDataByName("class_name", classes.GetClassName(client->GetPlayer()->GetAdventureClass()), i); packet->setArrayDataByName("class_name", classes.GetClassName(client->GetPlayer()->GetAdventureClass()), i);
} }
} }