diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-02-05 23:42:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-02-05 23:42:31 +0100 |
| commit | 14dfc377b48bc909894396e65d4e4ce89d9708b6 (patch) | |
| tree | 4c4a44bbbbd26e1266f1ffead2ce16890035e335 /src/server/game/Handlers/VehicleHandler.cpp | |
| parent | 075f0e26ccaea835f1b3b771b717e9edef0d0b59 (diff) | |
Core/Misc: Various crash fixes (#19059)
* Replaced some FindPlayer calls with GetPlayer
Fixed some more crashes
* Correction
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 0cdf22e2bd0..17af33cb270 100644 --- a/src/server/game/Handlers/VehicleHandler.cpp +++ b/src/server/game/Handlers/VehicleHandler.cpp @@ -130,7 +130,7 @@ void WorldSession::HandleEnterPlayerVehicle(WorldPacket &data) ObjectGuid guid; data >> guid; - if (Player* player = ObjectAccessor::FindPlayer(guid)) + if (Player* player = ObjectAccessor::GetPlayer(*_player, guid)) { if (!player->GetVehicleKit()) return; @@ -138,6 +138,9 @@ void WorldSession::HandleEnterPlayerVehicle(WorldPacket &data) 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); } |