diff options
| author | megamage <none@none> | 2009-03-07 00:54:55 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-07 00:54:55 -0600 |
| commit | d713beef29933ab5df52057699030b18e047ee63 (patch) | |
| tree | 095d1c0fb0f84625cc1c4a68aef115cb4d8c87a6 /src/game/BattleGroundWS.cpp | |
| parent | 6dc06ab53b2e5307b682c5723b3c6fd62318633e (diff) | |
| parent | 544ff30daea497869132a70b597bbc0b5bcdc2ba (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 500b00feb46..3a8c5668a7a 100644 --- a/src/game/BattleGroundWS.cpp +++ b/src/game/BattleGroundWS.cpp @@ -441,7 +441,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) { @@ -470,7 +470,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) { |