From 05820e3425e19596ae4a0aac3642e976199191b4 Mon Sep 17 00:00:00 2001 From: killerwife Date: Wed, 10 Apr 2024 22:37:50 +0200 Subject: [PATCH] Instance: Do not trigger ::AddInstanceEvent as GM --- .../hellfire_citadel/shattered_halls/shattered_halls.cpp | 3 +++ .../scripts/outland/tempest_keep/botanica/botanica.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.cpp b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.cpp index 0f7c2b3d43..fd52201f13 100644 --- a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.cpp +++ b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.cpp @@ -554,6 +554,9 @@ void instance_shattered_halls::AddInstanceEvent(uint32 id, std::functionGetPlayers()) { + if (data.getSource()->IsGameMaster()) + continue; + if (check(data.getSource())) { successEvent(); diff --git a/src/game/AI/ScriptDevAI/scripts/outland/tempest_keep/botanica/botanica.cpp b/src/game/AI/ScriptDevAI/scripts/outland/tempest_keep/botanica/botanica.cpp index 0c4e27f64c..083bec7b0b 100644 --- a/src/game/AI/ScriptDevAI/scripts/outland/tempest_keep/botanica/botanica.cpp +++ b/src/game/AI/ScriptDevAI/scripts/outland/tempest_keep/botanica/botanica.cpp @@ -41,6 +41,9 @@ void instance_botanica::AddInstanceEvent(uint32 id, std::functionGetPlayers()) { + if (data.getSource()->IsGameMaster()) + continue; + if (check(data.getSource())) { successEvent();