pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue when RemoveXTarget was called with a mob not on our XTargets

Browse Source 
This could be better, but works for now
This commit is contained in:
Michael Cook (mackal) 2015-09-04 12:12:29 -04:00
parent 5126104fd6
commit 0d3bd5988b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/client.cpp
View File

@ -7095,7 +7095,8 @@ void Client::RemoveXTarget(Mob *m, bool OnlyAutoSlots)
} }
} }
// move shit up! // move shit up! If the removed NPC was in a CurrentTargetNPC slot it becomes Auto
// and we need to potentially fill it
std::queue<int> empty_slots; std::queue<int> empty_slots;
for (int i = 0; i < GetMaxXTargets(); ++i) { for (int i = 0; i < GetMaxXTargets(); ++i) {
if (XTargets[i].Type != Auto) if (XTargets[i].Type != Auto)
@ -7211,7 +7212,11 @@ void Client::SendXTargetUpdates()
} }
} }
assert(count > 0); // we don't have any logic to prevent this, assert for now // RemoveXTarget probably got called with a mob not on our xtargets
if (count == 0) {
safe_delete(outapp);
return;
}
auto newbuff = new uchar[outapp->GetWritePosition()]; auto newbuff = new uchar[outapp->GetWritePosition()];
memcpy(newbuff, outapp->pBuffer, outapp->GetWritePosition()); memcpy(newbuff, outapp->pBuffer, outapp->GetWritePosition());