From f4f56c105fabf33398d332c09c8e331bc4025192 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 27 Apr 2020 19:29:01 +0200 Subject: Core/Vehicles: update the power display of vehicles before being added to world to avoid building unnecessary update_object packets right after spawning them (cherry picked from commit 1610337e67ed3f2fc8bc2ab7b3e3f2bd1b7b1033) --- src/server/game/Entities/Creature/Creature.cpp | 3 ++- src/server/game/Entities/Vehicle/Vehicle.cpp | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index db9d6bfc925..34cf8a528c7 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1694,7 +1694,8 @@ bool Creature::CreateFromProto(ObjectGuid::LowType guidlow, uint32 entry, Creatu } if (vehId) - CreateVehicleKit(vehId, entry, true); + if (CreateVehicleKit(vehId, entry, true)) + UpdateDisplayPower(); return true; } diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 70656f1a421..dac2d725a89 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -76,8 +76,6 @@ Vehicle::~Vehicle() void Vehicle::Install() { - _me->UpdateDisplayPower(); - _status = STATUS_INSTALLED; if (GetBase()->GetTypeId() == TYPEID_UNIT) sScriptMgr->OnInstall(this); -- cgit v1.2.3