diff options
Diffstat (limited to 'src/server/game/Handlers/VehicleHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/VehicleHandler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Handlers/VehicleHandler.cpp b/src/server/game/Handlers/VehicleHandler.cpp index 5880268d976..95e2746d94e 100644 --- a/src/server/game/Handlers/VehicleHandler.cpp +++ b/src/server/game/Handlers/VehicleHandler.cpp @@ -122,7 +122,7 @@ void WorldSession::HandleRequestVehicleSwitchSeat(WorldPackets::Vehicle::Request void WorldSession::HandleRideVehicleInteract(WorldPackets::Vehicle::RideVehicleInteract& rideVehicleInteract) { - if (Player* player = ObjectAccessor::FindPlayer(rideVehicleInteract.Vehicle)) + if (Player* player = ObjectAccessor::GetPlayer(*_player, rideVehicleInteract.Vehicle)) { if (!player->GetVehicleKit()) return; @@ -130,6 +130,9 @@ void WorldSession::HandleRideVehicleInteract(WorldPackets::Vehicle::RideVehicleI return; if (!player->IsWithinDistInMap(_player, INTERACTION_DISTANCE)) return; + // Dont' allow players to enter player vehicle on arena + if (!_player->FindMap() || _player->FindMap()->IsBattleArena()) + return; _player->EnterVehicle(player); } |