Scripts/AzjolNerub: minor corrections

ref #19072

2 files changed, 8 insertions, 1 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 3ac32936ac4..8b4d18ec9df 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -968,6 +968,8 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript
             InstanceScript* instance = caster->GetInstanceScript();
             if (!instance)
                 return;
+            if (!instance->instance->HavePlayers())
+                return;
             if (instance->GetBossState(DATA_HADRONOX) == DONE)
                 GetAura()->Remove();
             else
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
index eb6692f0251..512845a9600 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -76,9 +76,14 @@ class instance_azjol_nerub : public InstanceMapScript
             void OnUnitDeath(Unit* who) override
             {
                 InstanceScript::OnUnitDeath(who);
+
+                if (who->GetTypeId() != TYPEID_UNIT || GetBossState(DATA_KRIKTHIR) == DONE)
+                    return;
+
                 Creature* creature = who->ToCreature();
-                if (!creature || creature->IsCritter() || creature->IsControlledByPlayer())
+                if (creature->IsCritter() || creature->IsCharmedOwnedByPlayerOrPlayer())
                     return;
+
                 if (Creature* gatewatcher = GetCreature(DATA_KRIKTHIR))
                     gatewatcher->AI()->DoAction(-ACTION_GATEWATCHER_GREET);
             }