diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/CoreAI/UnitAI.h | 2 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartAI.h | 3 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.h | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Pet/pet_generic.cpp | 4 |
8 files changed, 18 insertions, 5 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index ae2c510d557..3a146126469 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -294,7 +294,7 @@ class TC_GAME_API UnitAI virtual void JustExitedCombat() { } // Called when the unit is about to be removed from the world (despawn, grid unload, corpse disappearing, player logging out etc.) - virtual void LeavingWorld() { } + virtual void OnDespawn() { } // Called at any Damage to any victim (before damage apply) virtual void DamageDealt(Unit* /*victim*/, uint32& /*damage*/, DamageEffectType /*damageType*/) { } diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index a35676754e3..7870c827670 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -675,6 +675,11 @@ void SmartAI::CorpseRemoved(uint32& respawnDelay) GetScript()->ProcessEventsFor(SMART_EVENT_CORPSE_REMOVED, nullptr, respawnDelay); } +void SmartAI::OnDespawn() +{ + GetScript()->ProcessEventsFor(SMART_EVENT_ON_DESPAWN); +} + void SmartAI::PassengerBoarded(Unit* who, int8 seatId, bool apply) { GetScript()->ProcessEventsFor(apply ? SMART_EVENT_PASSENGER_BOARDED : SMART_EVENT_PASSENGER_REMOVED, who, uint32(seatId), 0, apply); diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h index f18316abf38..b4bf355ab72 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.h +++ b/src/server/game/AI/SmartScripts/SmartAI.h @@ -159,6 +159,9 @@ class TC_GAME_API SmartAI : public CreatureAI // called when the corpse of this creature gets removed void CorpseRemoved(uint32& respawnDelay) override; + // Called when the unit is about to be removed from the world (despawn, grid unload, corpse disappearing) + void OnDespawn() override; + // Called when a Player/Creature enters the creature (vehicle) void PassengerBoarded(Unit* who, int8 seatId, bool apply) override; diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 285e736317d..c4087ed21cf 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2909,6 +2909,7 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui case SMART_EVENT_JUST_CREATED: case SMART_EVENT_FOLLOW_COMPLETED: case SMART_EVENT_ON_SPELLCLICK: + case SMART_EVENT_ON_DESPAWN: ProcessAction(e, unit, var0, var1, bvar, spell, gob); break; case SMART_EVENT_GOSSIP_HELLO: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 9069c3ab756..8754eb0e413 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -774,6 +774,7 @@ bool SmartAIMgr::CheckUnusedEventParams(SmartScriptHolder const& e) case SMART_EVENT_ON_SPELL_CAST: return sizeof(SmartEvent::spellCast); case SMART_EVENT_ON_SPELL_FAILED: return sizeof(SmartEvent::spellCast); case SMART_EVENT_ON_SPELL_START: return sizeof(SmartEvent::spellCast); + case SMART_EVENT_ON_DESPAWN: return NO_PARAMS; default: TC_LOG_WARN("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u is using an event with no unused params specified in SmartAIMgr::CheckUnusedEventParams(), please report this.", e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType()); @@ -1400,6 +1401,7 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e) case SMART_EVENT_JUST_CREATED: case SMART_EVENT_FOLLOW_COMPLETED: case SMART_EVENT_ON_SPELLCLICK: + case SMART_EVENT_ON_DESPAWN: break; // Unused case SMART_EVENT_TARGET_HEALTH_PCT: diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 7f7044769c4..9e1b4846d64 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -185,8 +185,9 @@ enum SMART_EVENT SMART_EVENT_ON_SPELL_CAST = 83, // SpellID, CooldownMin, CooldownMax SMART_EVENT_ON_SPELL_FAILED = 84, // SpellID, CooldownMin, CooldownMax SMART_EVENT_ON_SPELL_START = 85, // SpellID, CooldownMin, CooldownMax + SMART_EVENT_ON_DESPAWN = 86, // NONE - SMART_EVENT_END = 86 + SMART_EVENT_END = 87 }; struct SmartEvent @@ -1512,6 +1513,7 @@ const uint32 SmartAIEventMask[SMART_EVENT_END][2] = {SMART_EVENT_ON_SPELL_CAST, SMART_SCRIPT_TYPE_MASK_CREATURE }, {SMART_EVENT_ON_SPELL_FAILED, SMART_SCRIPT_TYPE_MASK_CREATURE }, {SMART_EVENT_ON_SPELL_START, SMART_SCRIPT_TYPE_MASK_CREATURE }, + {SMART_EVENT_ON_DESPAWN, SMART_SCRIPT_TYPE_MASK_CREATURE }, }; enum SmartEventFlags diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 43f9623e646..8316f8ff49f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9584,7 +9584,7 @@ void Unit::RemoveFromWorld() { m_duringRemoveFromWorld = true; if (UnitAI* ai = GetAI()) - ai->LeavingWorld(); + ai->OnDespawn(); if (IsVehicle()) RemoveVehicleKit(); diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 6e7b62f6451..1d3c44bfb3d 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -123,7 +123,7 @@ struct npc_pet_gen_soul_trader : public ScriptedAI { npc_pet_gen_soul_trader(Creature* creature) : ScriptedAI(creature) { } - void LeavingWorld() override + void OnDespawn() override { if (Unit* owner = me->GetOwner()) DoCast(owner, SPELL_ETHEREAL_PET_REMOVE_AURA); @@ -149,7 +149,7 @@ struct npc_pet_lich : public ScriptedAI { npc_pet_lich(Creature* creature) : ScriptedAI(creature) { } - void LeavingWorld() override + void OnDespawn() override { if (Unit* owner = me->GetOwner()) DoCast(owner, SPELL_LICH_REMOVE_AURA); |