Core/Spells: Move hacky check for spec changing to its correct location

--HG--
branch : trunk

2 files changed, 8 insertions, 5 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ea06570c68f..d5c9c6d6d94 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -24059,11 +24059,6 @@ void Player::ActivateSpec(uint8 spec)
     if (spec > GetSpecsCount())
         return;
 
-    // TODO:
-    // HACK: this shouldn't be checked at such a low level function but rather at the moment the spell is casted
-    if (GetMap()->IsBattleground() && !HasAura(44521)) // In Battleground with no Preparation buff
-        return;
-
     if (IsNonMeleeSpellCasted(false))
         InterruptNonMeleeSpells(false);
 
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 0f34ea7a553..af04f408aad 100755
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -6933,6 +6933,14 @@ void Spell::EffectSpecCount(SpellEffIndex /*effIndex*/)
 
 void Spell::EffectActivateSpec(SpellEffIndex /*effIndex*/)
 {
+    // can't change during already started arena/battleground
+    if (Battleground const* bg = m_caster->ToPlayer()->GetBattleground())
+        if (bg->GetStatus() == STATUS_IN_PROGRESS)
+        {
+            SendCastResult(SPELL_FAILED_NOT_IN_BATTLEGROUND);
+            return;
+        }
+
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;