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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 0fd3c3fa3ba..b809128e731 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -473,7 +473,7 @@ public:
             if (FlameStrikeTimer <= diff)
             {
                 DoCast(me, SPELL_FLAMESTRIKE1_NORMAL, true);
-                me->Kill(me);
+                me->KillSelf();
             } else FlameStrikeTimer -= diff;
         }
     };
@@ -636,7 +636,7 @@ public:
             if (HatchTimer <= diff)
             {
                 me->SummonCreature(CREATURE_PHOENIX, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000);
-                me->Kill(me);
+                me->KillSelf();
             } else HatchTimer -= diff;
         }
     };
@@ -675,7 +675,7 @@ public:
         void UpdateAI(uint32 diff) override
         {
             if (DespawnTimer <= diff)
-                me->Kill(me);
+                me->KillSelf();
             else
                 DespawnTimer -= diff;
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index 20e0137c868..38014f92962 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -139,7 +139,7 @@ class boss_selin_fireheart : public CreatureScript
                 for (Creature* crystal : Crystals)
                 {
                     if (crystal && crystal->IsAlive())
-                        crystal->Kill(crystal);
+                        crystal->KillSelf();
                 }
             }
 
@@ -218,7 +218,7 @@ class boss_selin_fireheart : public CreatureScript
 
                             Creature* CrystalChosen = ObjectAccessor::GetCreature(*me, CrystalGUID);
                             if (CrystalChosen && CrystalChosen->IsAlive())
-                                CrystalChosen->Kill(CrystalChosen);
+                                CrystalChosen->KillSelf();
 
                             CrystalGUID.Clear();