diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.cpp | 9 | ||||
-rwxr-xr-x | src/server/game/Entities/Vehicle/Vehicle.h | 1 | ||||
-rwxr-xr-x | src/server/game/Scripting/ScriptMgr.cpp | 9 | ||||
-rwxr-xr-x | src/server/game/Scripting/ScriptMgr.h | 4 |
5 files changed, 0 insertions, 25 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 8b412c9f23a..c28c3473797 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12402,8 +12402,6 @@ void Unit::setDeathState(DeathState s) ClearDiminishings(); GetMotionMaster()->Clear(false); GetMotionMaster()->MoveIdle(); - if (m_vehicleKit) - m_vehicleKit->Die(); SendMonsterStop(true); //without this when removing IncreaseMaxHealth aura player may stuck with 1 hp //do not why since in IncreaseMaxHealth currenthealth is checked diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 6bb3264fc18..69dd3cc18a0 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -141,15 +141,6 @@ void Vehicle::Uninstall() sScriptMgr->OnUninstall(this); } -void Vehicle::Die() -{ - sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Die Entry: %u, GuidLow: %u", m_creatureEntry, me->GetGUIDLow()); - RemoveAllPassengers(); - - if (GetBase()->GetTypeId() == TYPEID_UNIT) - sScriptMgr->OnDie(this); -} - void Vehicle::Reset() { sLog->outDebug(LOG_FILTER_VEHICLES, "Vehicle::Reset"); diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index fcae3d554d3..b832a6077c0 100755 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -120,7 +120,6 @@ class Vehicle void Install(); void Uninstall(); void Reset(); - void Die(); void InstallAllAccessories(); Unit *GetBase() const { return me; } diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 4219a17903f..8f8e4175476 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -954,15 +954,6 @@ void ScriptMgr::OnUninstall(Vehicle* veh) tmpscript->OnUninstall(veh); } -void ScriptMgr::OnDie(Vehicle* veh) -{ - ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); - - GET_SCRIPT(VehicleScript, veh->GetBase()->ToCreature()->GetScriptId(), tmpscript); - tmpscript->OnDie(veh); -} - void ScriptMgr::OnReset(Vehicle* veh) { ASSERT(veh); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 090da699032..c2e6a911c62 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -584,9 +584,6 @@ class VehicleScript : public ScriptObject // Called after a vehicle is uninstalled. virtual void OnUninstall(Vehicle* /*veh*/) { } - // Called after a vehicle dies. - virtual void OnDie(Vehicle* /*veh*/) { } - // Called when a vehicle resets. virtual void OnReset(Vehicle* /*veh*/) { } @@ -898,7 +895,6 @@ class ScriptMgr void OnInstall(Vehicle* veh); void OnUninstall(Vehicle* veh); - void OnDie(Vehicle* veh); void OnReset(Vehicle* veh); void OnInstallAccessory(Vehicle* veh, Creature* accessory); void OnAddPassenger(Vehicle* veh, Unit* passenger, int8 seatId); |