From b44d086d370a269c3b1e1bbf758d87d9185f050e Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 29 Nov 2021 17:28:45 -0500 Subject: [PATCH] Core: VehicleJoinEvent crash fix Port From (https://github.com/TrinityCore/TrinityCore/commit/fe0cff0caeda48cd49f5d3898607bdb34704b868) --- Source/Game/Entities/Vehicle.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Game/Entities/Vehicle.cs b/Source/Game/Entities/Vehicle.cs index dadd1f25d..be2e7e338 100644 --- a/Source/Game/Entities/Vehicle.cs +++ b/Source/Game/Entities/Vehicle.cs @@ -574,6 +574,11 @@ namespace Game.Entities return true; } + //It's possible that multiple vehicle join + //events are executed in the same update + if (Passenger.GetVehicle() != null) + Passenger.ExitVehicle(); + Passenger.SetVehicle(Target); Seat.Value.Passenger.Guid = Passenger.GetGUID(); Seat.Value.Passenger.IsUnselectable = Passenger.HasUnitFlag(UnitFlags.NotSelectable);