From 7267a414183fce4e146d464e0a2124f617da9648 Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Tue, 4 Oct 2016 11:44:25 +0200 Subject: Make travis happy and fix codestyle for previous commit. --- src/server/game/Conditions/ConditionMgr.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index b4d9d097f14..ddcf21c197a 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -499,13 +499,11 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const case CONDITION_WINTERGRASP_HORDE: { condMeets = false; - if (Player* player = object->ToPlayer()) - { - Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(1); - if (wintergrasp->IsEnabled()) - if (wintergrasp->GetDefenderTeam() == TEAM_HORDE) - condMeets = true; - } + if (object->ToPlayer()) + if (Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) + if (wintergrasp->IsEnabled()) + if (wintergrasp->GetDefenderTeam() == TEAM_HORDE) + condMeets = true; break; } default: -- cgit v1.2.3