aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <krzysiek.7.5.4@gmail.com>2011-10-09 02:24:34 -0700
committerShauren <krzysiek.7.5.4@gmail.com>2011-10-09 02:24:34 -0700
commit20fdd5532ff798102229e398d5f7977eb372102d (patch)
treeb2290f189ce5056bdc37ff36d7c0d935846bffc3 /src
parent25cec68193d9d017ac51cda5a49d0d75d2949077 (diff)
parentc244f1d7bf9452380a6a3dd12c680744cd14b682 (diff)
Merge pull request #3416 from Kapoeira/master
Scripts/ICC: Prevent players from teleporting to the Lich King if they are in combat
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
index 41bed882166..1242e90c2f3 100755
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
@@ -78,6 +78,13 @@ class at_frozen_throne_teleport : public AreaTriggerScript
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
{
+ if (player->isInCombat())
+ {
+ if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(FROZEN_THRONE_TELEPORT))
+ Spell::SendCastResult(player, spell, 0, SPELL_FAILED_AFFECTING_COMBAT);
+ return true;
+ }
+
if (InstanceScript* instance = player->GetInstanceScript())
if (instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE &&
instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE &&