diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-02-05 23:42:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-07-21 21:06:54 +0200 |
| commit | 4f65dc5e20cc3af5b3595809707c632faa6e5900 (patch) | |
| tree | b265710b6dd2d87bb0f4409770ab77d116654de0 /src/server/game/Handlers/VehicleHandler.cpp | |
| parent | ad4e63bae145ae49b584ab2fc621660430cec0d3 (diff) | |
Core/Misc: Various crash fixes (#19059)
* Replaced some FindPlayer calls with GetPlayer
Fixed some more crashes
* Correction
(cherrypicked from 14dfc377b48bc909894396e65d4e4ce89d9708b6)
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); } |