Core/Misc: Various crash fixes

Port From (https://github.com/TrinityCore/TrinityCore/commit/4f65dc5e20cc3af5b3595809707c632faa6e5900)
2019-08-17 11:23:32 -04:00
parent a44224564c
commit 2d2a72ce3e
13 changed files with 65 additions and 37 deletions
@@ -144,7 +144,7 @@ namespace Game
        [WorldPacketHandler(ClientOpcodes.RideVehicleInteract)]
        void HandleRideVehicleInteract(RideVehicleInteract packet)
        {
-            Player player = Global.ObjAccessor.FindPlayer(packet.Vehicle);
+            Player player = Global.ObjAccessor.GetPlayer(_player, packet.Vehicle);
            if (player)
            {
                if (!player.GetVehicleKit())
@@ -153,6 +153,9 @@ namespace Game
                    return;
                if (!player.IsWithinDistInMap(GetPlayer(), SharedConst.InteractionDistance))
                    return;
+                // Dont' allow players to enter player vehicle on arena
+                if (!_player.GetMap() || _player.GetMap().IsBattleArena())
+                    return;

                GetPlayer().EnterVehicle(player);
            }