Block battleground-flag from being picked up while player is on a vehicle

Fix by Scazzato - closes issue #1161

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index ced9c495a7e..ea582b28e03 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -1392,6 +1392,8 @@ void GameObject::Use(Unit* user)
                 BattleGround *bg = player->GetBattleGround();
                 if (!bg)
                     return;
+                if (player->GetVehicle())
+                    return;
                 // BG flag click
                 // AB:
                 // 15001
@@ -1417,6 +1419,8 @@ void GameObject::Use(Unit* user)
                 BattleGround *bg = player->GetBattleGround();
                 if (!bg)
                     return;
+                if( player->GetVehicle())
+                    return;
                 // BG flag dropped
                 // WS:
                 // 179785 - Silverwing Flag