nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-02 10:33:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Unit): Add KillSelf overload (#14785)

Browse Source 
Co-authored-by: jackpoz <giacomopoz@gmail.com>
This commit is contained in:
Skjalf
2023-01-28 17:57:23 -03:00
committed by GitHub
parent 6ae8ffa8e6
commit b4e3f1310b
28 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -1059,7 +1059,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
{
if (me && !me->isDead())
{
Unit::Kill(me, me);
me->KillSelf();
LOG_DEBUG("sql.sql", "SmartScript::ProcessAction: SMART_ACTION_DIE: Creature {}", me->GetGUID().ToString());
}
break;

1
src/server/game/Entities/Unit/Unit.h
View File

@@ -1548,6 +1548,7 @@ public:
static void DealDamageMods(Unit const* victim, uint32& damage, uint32* absorb);
static uint32 DealDamage(Unit* attacker, Unit* victim, uint32 damage, CleanDamage const* cleanDamage = nullptr, DamageEffectType damagetype = DIRECT_DAMAGE, SpellSchoolMask damageSchoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellInfo const* spellProto = nullptr, bool durabilityLoss = true, bool allowGM = false, Spell const* spell = nullptr);
static void Kill(Unit* killer, Unit* victim, bool durabilityLoss = true, WeaponAttackType attackType = BASE_ATTACK, SpellInfo const* spellProto = nullptr, Spell const* spell = nullptr);
void KillSelf(bool durabilityLoss = true, WeaponAttackType attackType = BASE_ATTACK, SpellInfo const* spellProto = nullptr, Spell const* spell = nullptr) { Kill(this, this, durabilityLoss, attackType, spellProto, spell); };
static int32 DealHeal(Unit* healer, Unit* victim, uint32 addhealth);
static void ProcDamageAndSpell(Unit* actor, Unit* victim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellInfo const* procSpellInfo = nullptr, SpellInfo const* procAura = nullptr, int8 procAuraEffectIndex = -1, Spell const* procSpell = nullptr, DamageInfo* damageInfo = nullptr, HealInfo* healInfo = nullptr, uint32 procPhase = 2 /*PROC_SPELL_PHASE_HIT*/);

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
View File

@@ -306,7 +306,7 @@ public:
{
summons.DespawnEntry(_nefarianLeftTunnel);
summons.DespawnEntry(_nefarianRightTunnel);
Unit::Kill(me, me);
me->KillSelf();
}
}

2
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
View File

@@ -134,7 +134,7 @@ public:
if (summon->GetEntry() == NPC_ATTUMEN_THE_HUNTSMAN_MOUNTED)
{
summons.clear();
Unit::Kill(me, me);
me->KillSelf();
}
}

2
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
View File

@@ -206,7 +206,7 @@ public:
AttackStart(target);
return;
case EVENT_FINISH_TALK:
Unit::Kill(me, me);
me->KillSelf();
return;
}

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
View File

@@ -263,7 +263,7 @@ public:
break;
case EVENT_TALK_GOOD_5:
me->SetVisible(false);
Unit::Kill(me, me);
me->KillSelf();
break;
case EVENT_TALK_BAD_1:
me->SetReactState(REACT_PASSIVE);

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
View File

@@ -398,7 +398,7 @@ public:
switch (events2.ExecuteEvent())
{
case EVENT_KILL_SELF:
Unit::Kill(me, me);
me->KillSelf();
break;
case EVENT_REBIRTH:
me->SetVisible(true);

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
View File

@@ -299,7 +299,7 @@ public:
switch (events.ExecuteEvent())
{
case EVENT_SINGULARITY_DEATH:
Unit::Kill(me, me);
me->KillSelf();
break;
case EVENT_START_BLACK_HOLE:
me->RemoveAurasDueToSpell(SPELL_BLACK_HOLE_SUMMON_VISUAL2);

4
src/server/scripts/Events/brewfest.cpp
View File

@@ -733,7 +733,7 @@ struct npc_dark_iron_guzzler : public ScriptedAI
if (me->IsAlive() && spellInfo->Id == SPELL_PLAYER_MUG)
{
me->CastSpell(me, SPELL_MUG_BOUNCE_BACK, true);
Unit::Kill(me, me);
me->KillSelf();
me->CastSpell(me, SPELL_REPORT_DEATH, true);
}
}
@@ -795,7 +795,7 @@ struct npc_brewfest_super_brew_trigger : public ScriptedAI
{
player->CastSpell(player, SPELL_DRUNKEN_MASTER, true);
me->RemoveAllGameObjects();
Unit::Kill(me, me);
me->KillSelf();
}
}
}

2
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
View File

@@ -362,7 +362,7 @@ struct boss_glob_of_viscidus : public ScriptedAI
if (id == ROOM_CENTER)
{
DoCastSelf(SPELL_REJOIN_VISCIDUS);
Unit::Kill(me, me);
me->KillSelf();
}
}

2
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
View File

@@ -128,7 +128,7 @@ public:
if (pInstance->GetData(DATA_INSTANCE_PROGRESS) < INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED)
return;
Unit::Kill(me, me); // for bk scene, die after knockback
me->KillSelf(); // for bk scene, die after knockback
}
void UpdateAI(uint32 /*diff*/) override { }

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
View File

@@ -450,7 +450,7 @@ public:
}
}
me->setActive(false);
Unit::Kill(me, me);
me->KillSelf();
break;
}

2
src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp
View File

@@ -170,7 +170,7 @@ public:
{
summons.Despawn(summon);
if (summon->GetEntry() == NPC_DRAKKARI_ELEMENTAL)
Unit::Kill(me, me);
me->KillSelf();
}
void SummonedCreatureDespawn(Creature* summon) override

2
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -3566,7 +3566,7 @@ public:
events.ScheduleEvent(EVENT_GAUNTLET_PHASE3, 0);
}
else
Unit::Kill(me, me);
me->KillSelf();
}
}

2
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
View File

@@ -502,7 +502,7 @@ public:
if ((*itr)->GetGUID() != me->GetGUID() && (*itr)->IsAlive() && me->IsAlive())
if (Creature* is = me->SummonCreature(NPC_IRON_SLUDGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000))
{
Unit::Kill(me, me);
me->KillSelf();
Unit::Kill(*itr, *itr);
is->SetInCombatWithZone();
break;

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
View File

@@ -760,7 +760,7 @@ public:
data << uint32(SPELL_BOOM);
me->SendMessageToSet(&data, false);
Unit::Kill(me, me);
me->KillSelf();
// Visual only seems to work if the instant kill event is delayed or the spell itself is delayed
// Casting done from player and caster source has the same targetinfo flags,

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
View File

@@ -666,7 +666,7 @@ public:
summons.DespawnEntry(NPC_FREYA_KEEPER);
summons.DespawnEntry(NPC_THORIM_KEEPER);
summons.DespawnEntry(NPC_SANITY_WELL);
Unit::Kill(me, me);
me->KillSelf();
return;
}

6
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
View File

@@ -104,10 +104,10 @@ public:
if (Unit* p = ObjectAccessor::GetUnit(*me, PrisonerGUID))
{
if( !p->HasAura(SPELL_FROST_TOMB_AURA) )
Unit::Kill(me, me);
me->KillSelf();
}
else
Unit::Kill(me, me);
me->KillSelf();
}
}
};
@@ -294,7 +294,7 @@ public:
if( pInstance && pInstance->GetData(DATA_KELESETH) != IN_PROGRESS )
{
if( me->IsAlive() )
Unit::Kill(me, me);
me->KillSelf();
return;
}

2
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
View File

@@ -246,7 +246,7 @@ public:
if (s->IsAlive())
good = true;
if (!good)
Unit::Kill(me, me);
me->KillSelf();
}
else
checkTimer -= diff;

2
src/server/scripts/Northrend/zone_dragonblight.cpp
View File

@@ -1435,7 +1435,7 @@ public:
else if (a == -2)
{
me->CastSpell(me, SPELL_SAC_GHOUL_EXPLODE, true);
Unit::Kill(me, me);
me->KillSelf();
me->m_Events.KillAllEvents(true);
Deactivate();
}

2
src/server/scripts/Northrend/zone_storm_peaks.cpp
View File

@@ -391,7 +391,7 @@ public:
else if (type == ESCORT_MOTION_TYPE && me->movespline->Finalized())
startPath = true;
else if (type == EFFECT_MOTION_TYPE && pointId == me->GetEntry())
Unit::Kill(me, me);
me->KillSelf();
}
void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override

2
src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
View File

@@ -253,7 +253,7 @@ public:
me->AddAura(DUNGEON_MODE(SPELL_EMPOWERING_SHADOWS_N, SPELL_EMPOWERING_SHADOWS_H), Vorpil);
Vorpil->ModifyHealth(int32(Vorpil->CountPctFromMaxHealth(4)));
me->CastSpell(me, SPELL_SHADOW_NOVA, true);
Unit::Kill(me, me);
me->KillSelf();
return;
}

2
src/server/scripts/Outland/BlackTemple/illidari_council.cpp
View File

@@ -205,7 +205,7 @@ public:
if ((member = ObjectAccessor::GetCreature(*me, councilGUIDs[i])))
if (member->IsAlive())
Unit::Kill(me, member);
Unit::Kill(me, me);
me->KillSelf();
}
}

2
src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
View File

@@ -172,7 +172,7 @@ public:
{
if (Creature* kali = me->FindNearestCreature(NPC_WARLORD_KALITHRESH, 100.0f))
kali->CastSpell(kali, SPELL_WARLORDS_RAGE_PROC, true);
Unit::Kill(me, me);
me->KillSelf();
}
}
}

2
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
View File

@@ -121,7 +121,7 @@ public:
}
else if (summons.size() == 0)
{
Unit::Kill(me, me);
me->KillSelf();
}
}

2
src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
View File

@@ -340,7 +340,7 @@ public:
{
if (summon->GetEntry() == NPC_HARBINGER_SKYRISS)
{
Unit::Kill(me, me);
me->KillSelf();
me->setActive(false);
instance->SetBossState(DATA_WARDEN_MELLICHAR, DONE);
if (Creature* creature = summons.GetCreatureWithEntry(NPC_MILLHOUSE))

2
src/server/scripts/Pet/pet_generic.cpp
View File

@@ -640,7 +640,7 @@ struct npc_pet_gen_plump_turkey : public PassiveAI
{
if (type == EFFECT_MOTION_TYPE && id == 1)
{
Unit::Kill(me, me);
me->KillSelf();
me->AddAura(SPELL_TURKEY_STARTS_TO_BURN, me);
}
}

2
src/server/scripts/World/npcs_special.cpp
View File

@@ -444,7 +444,7 @@ public:
{
me->SetLootRecipient(me->GetOwner());
me->LowerPlayerDamageReq(me->GetMaxHealth());
Unit::Kill(me, me);
me->KillSelf();
deathTimer = 600000;
}
else