Skip to content

Commit 0f84b7f

Browse files
author
Rochet2
committed
Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]
2 parents 083ef86 + e5b8798 commit 0f84b7f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--
2+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=18899 AND `SourceId`=1;
3+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
4+
(22, 1, 18899, 1, 0, 13, 1, 4, 3, 0, 1, 0, 0, '', 'Execute SAI only if Wolf Master Nandos is not done');

src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,11 @@ class instance_shadowfang_keep : public InstanceMapScript
174174
break;
175175
case TYPE_NANDOS:
176176
if (data == DONE)
177-
DoUseDoorOrButton(DoorArugalGUID);
177+
{
178+
if (GameObject* go = instance->GetGameObject(DoorArugalGUID))
179+
if (go->GetGoState() == GO_STATE_READY)
180+
DoUseDoorOrButton(DoorArugalGUID);
181+
}
178182
m_auiEncounter[3] = data;
179183
break;
180184
case DATA_SPAWN_VALENTINE_ADDS:

0 commit comments

Comments
 (0)