nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 07:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(Scripts/Misc): Cleanup some more JustDied hooks (#9768)

Browse Source
This commit is contained in:
Kitzunu
2021-12-31 16:00:40 +01:00
committed by GitHub
parent 0556f0b3d5
commit 69683a3472
22 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
View File

@@ -347,7 +347,7 @@ public:
me->CallForHelp(500.0f);
}
void JustDied(Unit* /*pKiller*/) override
void JustDied(Unit* /*killer*/) override
{
RespawnDragons(true);
_JustDied();

2
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -494,7 +494,7 @@ public:
if (me->IsDamageEnoughForLootingAndReward())
halion->LowerPlayerDamageReq(halion->GetMaxHealth());
if (halion->IsAlive())
if (killer && halion->IsAlive())
Unit::Kill(killer, halion);
}

2
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
View File

@@ -570,7 +570,7 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void JustDied(Unit* ) override
void JustDied(Unit* /*killer*/) override
{
if (me->GetEntry() == NPC_UNSTOPPABLE_ABOMINATION && me->GetInstanceScript())
{

2
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
View File

@@ -473,7 +473,7 @@ public:
}
}
void JustDied(Unit* ) override
void JustDied(Unit* /*killer*/) override
{
Talk(me->GetEntry() == NPC_STALAGG ? SAY_STAL_DEATH : SAY_FEUG_DEATH);
Talk(me->GetEntry() == NPC_STALAGG ? EMOTE_STAL_DEATH : EMOTE_FEUG_DEATH);

2
src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
View File

@@ -1169,7 +1169,7 @@ public:
uint32 timer;
void JustDied(Unit* ) override
void JustDied(Unit* /*killer*/) override
{
if (me->GetEntry() == NPC_MR_BIGGLESWORTH && me->GetInstanceScript())
{

10
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
View File

@@ -718,7 +718,7 @@ public:
void JustDied(Unit* killer) override
{
if (me->GetEntry() == killer->GetEntry())
if (killer && me->GetEntry() == killer->GetEntry())
return;
me->Yell("Matron, flee! They are ruthless....", LANG_UNIVERSAL);
me->PlayDirectSound(SOUND_STONEBARK_DEATH);
@@ -824,7 +824,7 @@ public:
void JustDied(Unit* killer) override
{
if (me->GetEntry() == killer->GetEntry())
if (killer && me->GetEntry() == killer->GetEntry())
return;
me->Yell("Matron, one has fallen!", LANG_UNIVERSAL);
me->PlayDirectSound(SOUND_BRIGHTLEAF_DEATH);
@@ -945,7 +945,7 @@ public:
void JustDied(Unit* killer) override
{
if (me->GetEntry() == killer->GetEntry())
if (killer && me->GetEntry() == killer->GetEntry())
return;
me->Yell("Freya! They come for you.", LANG_UNIVERSAL);
me->PlayDirectSound(SOUND_IRONBRANCH_DEATH);
@@ -1011,7 +1011,7 @@ public:
{
boss_freya_iron_rootAI(Creature* pCreature) : NullCreatureAI(pCreature) { }
void JustDied(Unit*) override
void JustDied(Unit* /*killer*/) override
{
if (!me->IsSummon())
return;
@@ -1139,7 +1139,7 @@ public:
AttackStart(target);
}
void JustDied(Unit*) override
void JustDied(Unit* /*killer*/) override
{
if (Creature* freya = ObjectAccessor::GetCreature(*me, _freyaGUID))
{

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

@@ -782,7 +782,7 @@ public:
me->m_Events.AddEvent(new BoomEvent(me), me->m_Events.CalculateTime(1 * IN_MILLISECONDS));
}
void JustDied(Unit*) override
void JustDied(Unit* /*killer*/) override
{
me->m_Events.AddEvent(new BoomEvent(me), me->m_Events.CalculateTime(1 * IN_MILLISECONDS));
}

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

@@ -87,7 +87,7 @@ public:
void JustDied(Unit* killer) override
{
if (killer->GetGUID() != me->GetGUID())
if (killer && killer->GetGUID() != me->GetGUID())
if (InstanceScript* pInstance = me->GetInstanceScript())
pInstance->SetData(DATA_ON_THE_ROCKS_ACHIEV, 0);

2
src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
View File

@@ -149,7 +149,7 @@ public:
pInstance->SetData(EVENT_EMALON, IN_PROGRESS);
}
void JustDied(Unit* ) override
void JustDied(Unit* /*killer*/) override
{
summons.DespawnAll();
events.Reset();

2
src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
View File

@@ -97,7 +97,7 @@ public:
pInstance->SetData(EVENT_KORALON, IN_PROGRESS);
}
void JustDied(Unit* ) override
void JustDied(Unit* /*killer*/) override
{
if (pInstance)
pInstance->SetData(EVENT_KORALON, DONE);

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

@@ -41,7 +41,7 @@ public:
uint32 faction;
EventMap events;
void JustDied(Unit* ) override
void JustDied(Unit* /*killer*/) override
{
if (me->GetEntry() == NPC_KEEP_CANNON)
{