diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-08-27 15:30:27 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-08-27 15:30:27 -0500 |
| commit | 9fe45d68707d45f7a82e3314566edc66ff1d84a2 (patch) | |
| tree | 6e4fdd7152467f7b0935123a4ec196397284d3d9 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 02bbd1154eb3e119fb095850e60e3dc11ee937b1 (diff) | |
| parent | 9a11dc5ea6a56c41c044d5b28323d2fb420e3201 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rwxr-xr-x | src/server/game/Spells/SpellMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index b580c5e2282..e17e71f8869 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -1160,7 +1160,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 // team that controls the workshop in the specified area uint32 team = bf->GetData(newArea); - + if (team == TEAM_HORDE) return spellId == 56618; else if (team == TEAM_ALLIANCE) @@ -1172,7 +1172,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 { if (!player) return false; - + if (Battlefield* battlefieldWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) return battlefieldWG->IsEnabled() && (player->GetTeamId() == battlefieldWG->GetDefenderTeam()) && !battlefieldWG->IsWarTime(); break; |