diff options
| -rw-r--r-- | src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_hellfire_peninsula.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 774e026627d..5219d9573c1 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -719,7 +719,8 @@ class spell_baleroc_torment_AuraScript : public AuraScript uint32 stacks = healer->GetAuraCount(SPELL_VITAL_SPARK) + std::min(uint8(ceil(GetStackAmount() / (Is25ManHeroic ? 5 : 3))), uint8(255)); healer->SetAuraStack(SPELL_VITAL_SPARK, healer, stacks); - healer->GetAura(SPELL_VITAL_SPARK)->RefreshDuration(); + if (Aura* aura = healer->GetAura(SPELL_VITAL_SPARK)) + aura->RefreshDuration(); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index aac1edbdeee..aa28157d85f 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -975,7 +975,8 @@ public: case EVENT_ATTACK: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); me->setFaction(FACTION_HOSTILE); - me->CombatStart(ObjectAccessor::GetPlayer(*me, _playerGUID)); + if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID)) + me->CombatStart(player); _events.ScheduleEvent(EVENT_FIREBALL, 1); _events.ScheduleEvent(EVENT_FROSTNOVA, Seconds(5)); break; |