From 2ded17464ad25d03cc208a7f51c396a4a8129cef Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Tue, 20 Sep 2022 02:08:19 +0200 Subject: [PATCH] fix(Core): Crashfix on vehicle uninstall. (#13036) --- src/server/game/Entities/Vehicle/Vehicle.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 2ee067675..7256c0a6e 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -109,8 +109,10 @@ void Vehicle::Uninstall() LOG_DEBUG("vehicles", "Vehicle::Uninstall {}", _me->GetGUID().ToString()); RemoveAllPassengers(); - if (GetBase()->GetTypeId() == TYPEID_UNIT) + if (_me && _me->GetTypeId() == TYPEID_UNIT) + { sScriptMgr->OnUninstall(this); + } } void Vehicle::Reset(bool evading /*= false*/)