From 111b65e10f94fc339247acc2b8b66af05d34aab4 Mon Sep 17 00:00:00 2001 From: Gustavo Date: Sun, 16 Jul 2017 18:39:55 -0300 Subject: Core/Vehicles: Do not call InstallAllAccessories for dead Vehicles (#20033) (cherry picked from commit 551d0559aac663e9485b0eaffac5326536180c27) --- src/server/game/Entities/Vehicle/Vehicle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index a5b2dc302b7..cfa3adcf555 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -147,7 +147,8 @@ void Vehicle::Reset(bool evading /*= false*/) TC_LOG_DEBUG("entities.vehicle", "Vehicle::Reset (Entry: %u, %s, DBGuid: " UI64FMTD ")", GetCreatureEntry(), _me->GetGUID().ToString().c_str(), _me->ToCreature()->GetSpawnId()); ApplyAllImmunities(); - InstallAllAccessories(evading); + if (GetBase()->IsAlive()) + InstallAllAccessories(evading); sScriptMgr->OnReset(this); } -- cgit v1.2.3