From 84365f43b4bc171d9c57c1a1d96cd7f349da869f Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 25 Mar 2014 22:20:45 +0100 Subject: Scripts/Icecrown Citadel: Fixed Muradin/Saurfang attacking each other during Gunship Battle Closes #11786 --- .../Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 4706aeae6b2..4b938253584 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1083,7 +1083,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript { if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != IN_PROGRESS) return false; - return target->HasAura(SPELL_ON_ORGRIMS_HAMMER_DECK) || !target->IsControlledByPlayer(); + return target->HasAura(SPELL_ON_ORGRIMS_HAMMER_DECK) || target->GetEntry() == NPC_SKYBREAKER_MARINE || target->GetEntry() == NPC_SKYBREAKER_SERGEANT; } private: @@ -1353,7 +1353,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript { if (_instance->GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != IN_PROGRESS) return false; - return target->HasAura(SPELL_ON_SKYBREAKER_DECK) || !target->IsControlledByPlayer(); + return target->HasAura(SPELL_ON_SKYBREAKER_DECK) || target->GetEntry() == NPC_KOR_KRON_REAVER || target->GetEntry() == NPC_KOR_KRON_SERGEANT; } private: -- cgit v1.2.3