diff options
| author | megamage <none@none> | 2009-03-08 11:14:53 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-08 11:14:53 -0600 |
| commit | 881377ec65015f1e0048db93b28713676781ea25 (patch) | |
| tree | 97b70b2addd6ea4a56ef32543c4bca4fe194d7a1 /src/game/BattleGroundWS.cpp | |
| parent | 786fbdec571dbc2f48ce204338cf532aabfc0d2d (diff) | |
| parent | ae540b526bb3c0ca3c5d910da515030233f8ea55 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/BattleGroundWS.cpp')
| -rw-r--r-- | src/game/BattleGroundWS.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp index bb63840feb3..a5dd3f13a1c 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -405,7 +405,7 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target } //Alliance flag on ground(not in base) (returned or picked up again from ground!) - if(this->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10)) + if(this->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10) && target_obj->GetGOInfo()->id == BG_OBJECT_A_FLAG_GROUND_WS_ENTRY) { if(Source->GetTeam() == ALLIANCE) { @@ -434,7 +434,7 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target } //Horde flag on ground(not in base) (returned or picked up again) - if(this->GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10)) + if(this->GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10) && target_obj->GetGOInfo()->id == BG_OBJECT_H_FLAG_GROUND_WS_ENTRY) { if(Source->GetTeam() == HORDE) { |