aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorJeremy <Golrag@users.noreply.github.com>2021-12-27 13:55:59 +0100
committerGitHub <noreply@github.com>2021-12-27 13:55:59 +0100
commit15b91836351a61f471865a751d4ff9ab0b5775a0 (patch)
tree5d17a25bb9307841366f5d224cc8ed2e876a0836 /src/server/scripts
parentff9816ef3876fd7e9ed93693b2082fb3581bca4f (diff)
Core/ZoneScript: Add "invoker" param to ProcessEvent (#24758)
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp4
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp6
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp10
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp2
13 files changed, 20 insertions, 20 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index c642be5f59c..6ab29a86503 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -261,7 +261,7 @@ public:
return true;
}
- void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*obj*/, uint32 eventId, WorldObject* /*invoker*/) override
{
switch (eventId)
{
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 1c1b181693f..b8db7e7448f 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -172,7 +172,7 @@ class instance_magisters_terrace : public InstanceMapScript
}
}
- void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*obj*/, uint32 eventId, WorldObject* /*invoker*/) override
{
if (eventId == EVENT_SPAWN_KALECGOS)
if (!GetCreature(DATA_KALECGOS) && _events.Empty())
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index 1cc72dbbb75..ab29cbf2194 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -507,7 +507,7 @@ class instance_uldaman : public InstanceMapScript
return ObjectGuid::Empty;
} // end GetGuidData
- void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId, WorldObject* /*invoker*/) override
{
switch (eventId)
{
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 3e473f74ad3..bd714230c7c 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -219,7 +219,7 @@ class instance_zulaman : public InstanceMapScript
return true;
}
- void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*obj*/, uint32 eventId, WorldObject* /*invoker*/) override
{
switch (eventId)
{
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp
index 680b1e0d1c4..ebb618cd230 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp
@@ -30,7 +30,7 @@ void boss_horAI::Reset()
me->SetImmuneToAll(true);
me->SetReactState(REACT_PASSIVE);
if (instance->GetData(DATA_WAVE_COUNT) != NOT_STARTED)
- instance->ProcessEvent(nullptr, EVENT_DO_WIPE);
+ instance->ProcessEvent(nullptr, EVENT_DO_WIPE, nullptr);
}
void boss_horAI::DoAction(int32 actionId)
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index d68de052a17..7df468c46c1 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -712,7 +712,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
case EVENT_INTRO_LK_9:
if (Creature* falric = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FALRIC)))
falric->AI()->Talk(SAY_FALRIC_INTRO_2);
- _instance->ProcessEvent(nullptr, EVENT_SPAWN_WAVES);
+ _instance->ProcessEvent(nullptr, EVENT_SPAWN_WAVES, nullptr);
_events.ScheduleEvent(EVENT_INTRO_LK_10, 4000);
break;
case EVENT_INTRO_LK_10:
@@ -2076,7 +2076,7 @@ class at_hor_waves_restarter : public AreaTriggerScript
if (_instance->GetData(DATA_INTRO_EVENT) == DONE && _instance->GetBossState(DATA_MARWYN) != DONE)
{
- _instance->ProcessEvent(nullptr, EVENT_SPAWN_WAVES);
+ _instance->ProcessEvent(nullptr, EVENT_SPAWN_WAVES, nullptr);
if (Creature* falric = ObjectAccessor::GetCreature(*player, _instance->GetGuidData(DATA_FALRIC)))
{
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 1dceae62f90..077317428bc 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -444,7 +444,7 @@ class instance_halls_of_reflection : public InstanceMapScript
break;
case DATA_WAVE_COUNT:
if (_waveCount && data == NOT_STARTED)
- ProcessEvent(nullptr, EVENT_DO_WIPE);
+ ProcessEvent(nullptr, EVENT_DO_WIPE, nullptr);
break;
case DATA_FROSTSWORN_GENERAL:
if (data == DONE)
@@ -522,7 +522,7 @@ class instance_halls_of_reflection : public InstanceMapScript
switch (events.ExecuteEvent())
{
case EVENT_NEXT_WAVE:
- ProcessEvent(nullptr, EVENT_ADD_WAVE);
+ ProcessEvent(nullptr, EVENT_ADD_WAVE, nullptr);
break;
case EVENT_SPAWN_ESCAPE_EVENT:
SpawnEscapeEvent();
@@ -533,7 +533,7 @@ class instance_halls_of_reflection : public InstanceMapScript
}
}
- void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*obj*/, uint32 eventId, WorldObject* /*invoker*/) override
{
switch (eventId)
{
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index e109a1e793e..c2c8e01202f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -1409,7 +1409,7 @@ class instance_icecrown_citadel : public InstanceMapScript
}
}
- void ProcessEvent(WorldObject* source, uint32 eventId) override
+ void ProcessEvent(WorldObject* source, uint32 eventId, WorldObject* /*invoker*/) override
{
switch (eventId)
{
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index f795d2e7268..97b9e44b27e 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -153,7 +153,7 @@ public:
unit->SetControlled(true, UNIT_STATE_ROOT);
}
- void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*obj*/, uint32 eventId, WorldObject* /*invoker*/) override
{
if (eventId == EVENT_FOCUSING_IRIS)
{
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 0b7e8e890f0..08156b1f1b1 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -165,7 +165,7 @@ class instance_oculus : public InstanceMapScript
}
}
- void ProcessEvent(WorldObject* /*unit*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*unit*/, uint32 eventId, WorldObject* /*invoker*/) override
{
if (eventId != EVENT_CALL_DRAGON)
return;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index c2f757bd25a..dc29a530eb3 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1310,21 +1310,21 @@ class go_ulduar_tower : public GameObjectScript
InstanceScript* instance;
- void Destroyed(WorldObject* /*attacker*/, uint32 /*eventId*/) override
+ void Destroyed(WorldObject* attacker, uint32 /*eventId*/) override
{
switch (me->GetEntry())
{
case GO_TOWER_OF_STORMS:
- instance->ProcessEvent(me, EVENT_TOWER_OF_STORM_DESTROYED);
+ instance->ProcessEvent(me, EVENT_TOWER_OF_STORM_DESTROYED, attacker);
break;
case GO_TOWER_OF_FLAMES:
- instance->ProcessEvent(me, EVENT_TOWER_OF_FLAMES_DESTROYED);
+ instance->ProcessEvent(me, EVENT_TOWER_OF_FLAMES_DESTROYED, attacker);
break;
case GO_TOWER_OF_FROST:
- instance->ProcessEvent(me, EVENT_TOWER_OF_FROST_DESTROYED);
+ instance->ProcessEvent(me, EVENT_TOWER_OF_FROST_DESTROYED, attacker);
break;
case GO_TOWER_OF_LIFE:
- instance->ProcessEvent(me, EVENT_TOWER_OF_LIFE_DESTROYED);
+ instance->ProcessEvent(me, EVENT_TOWER_OF_LIFE_DESTROYED, attacker);
break;
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index 372bdbeb4c8..b2e2bfc3e2d 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -577,7 +577,7 @@ class instance_ulduar : public InstanceMapScript
}
}
- void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId, WorldObject* /*invoker*/) override
{
switch (eventId)
{
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index fdf81936765..6ac9201d023 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -928,7 +928,7 @@ class instance_violet_hold : public InstanceMapScript
});
}
- void ProcessEvent(WorldObject* /*go*/, uint32 eventId) override
+ void ProcessEvent(WorldObject* /*go*/, uint32 eventId, WorldObject* /*invoker*/) override
{
if (eventId == EVENT_ACTIVATE_CRYSTAL)
{