aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/3.3.5/2025_04_28_00_world.sql4
-rw-r--r--src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp6
2 files changed, 9 insertions, 1 deletions
diff --git a/sql/updates/world/3.3.5/2025_04_28_00_world.sql b/sql/updates/world/3.3.5/2025_04_28_00_world.sql
new file mode 100644
index 00000000000..44855b984e5
--- /dev/null
+++ b/sql/updates/world/3.3.5/2025_04_28_00_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=18899 AND `SourceId`=1;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22, 1, 18899, 1, 0, 13, 1, 4, 3, 0, 1, 0, 0, '', 'Execute SAI only if Wolf Master Nandos is not done');
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index e3a7dcad6c6..7e18585817f 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -174,7 +174,11 @@ public:
break;
case TYPE_NANDOS:
if (data == DONE)
- DoUseDoorOrButton(DoorArugalGUID);
+ {
+ if (GameObject* go = instance->GetGameObject(DoorArugalGUID))
+ if (go->GetGoState() == GO_STATE_READY)
+ DoUseDoorOrButton(DoorArugalGUID);
+ }
m_auiEncounter[3] = data;
break;
case DATA_SPAWN_VALENTINE_ADDS: