From 2f1bd93c9e943e584bcd576261da200eec91747f Mon Sep 17 00:00:00 2001 From: jackpoz Date: Mon, 7 Dec 2015 20:06:02 +0100 Subject: Core/Unit: Add Unit::KillSelf() overload Add Unit::KillSelf() function as overload of Unit::Kill(this) . Use KillSelf() whenever the killer and the victim are the same to clearly state the Unit is going to kill itself. (cherry picked from commit 3267c90102068ed88c0bd7146ae747fe8ba44771) # Conflicts: # src/server/game/AI/SmartScripts/SmartScript.cpp --- src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/EasternKingdoms/Stratholme') diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 246433db625..4ebefcf7122 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -170,7 +170,7 @@ public: { if (Player* player = temp->ToPlayer()) player->KilledMonsterCredit(NPC_RESTLESS, me->GetGUID()); - me->Kill(me); + me->KillSelf(); } } else @@ -248,7 +248,7 @@ public: if (Tagged) { if (Die_Timer <= diff) - me->Kill(me); + me->KillSelf(); else Die_Timer -= diff; } -- cgit v1.2.3