From 6aa0c9d694f9a3b9ee23c700792fa69df58b7ad0 Mon Sep 17 00:00:00 2001 From: SecretsOTheP Date: Tue, 22 Apr 2014 13:37:35 -0400 Subject: [PATCH] hatelist fixes to fixes to fixes --- zone/bot.cpp | 2 +- zone/client.cpp | 2 +- zone/merc.cpp | 2 +- zone/npc.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index ae793cd47..940780715 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -223,7 +223,7 @@ Bot::~Bot() { GetPet()->Depop(); entity_list.RemoveBot(GetID()); - entity_list.RemoveFromTargets(GetID(), true); + entity_list.RemoveFromTargets(this, true); } void Bot::SetBotID(uint32 botID) { diff --git a/zone/client.cpp b/zone/client.cpp index b2b9ff023..20b2b1412 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -427,7 +427,7 @@ Client::~Client() { eqs->Close(); eqs->ReleaseFromUse(); //Moved this from ~Mob, because it could cause a crash in some cases where a hate list was still used and that mob was the only one on the hate list. - entity_list.RemoveFromTargets(GetID(), true); + entity_list.RemoveFromTargets(this, true); UninitializeBuffSlots(); } diff --git a/zone/merc.cpp b/zone/merc.cpp index 05cdbb65c..a1de41f71 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -76,7 +76,7 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading) Merc::~Merc() { AI_Stop(); entity_list.RemoveMerc(this->GetID()); - entity_list.RemoveFromTargets(GetID(), true); + entity_list.RemoveFromTargets(this, true); UninitializeBuffSlots(); } diff --git a/zone/npc.cpp b/zone/npc.cpp index 13c60965a..0afee9b51 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -393,7 +393,7 @@ NPC::~NPC() safe_delete(swarmInfoPtr); safe_delete(qGlobals); //Moved this from ~Mob, because it could cause a crash in some cases where a hate list was still used and that mob was the only one on the hate list. - entity_list.RemoveFromTargets(GetID(), true); + entity_list.RemoveFromTargets(this, true); UninitializeBuffSlots(); }