aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarah Alexander <sarah.trysan@live.com>2015-05-29 13:27:49 -0300
committerSarah Alexander <sarah.trysan@live.com>2015-05-29 13:27:49 -0300
commitb3c8c4f34d37da56391de550678c6e1bf93b607a (patch)
tree38a30cebd77514f328aa38066f6d85c3d00d37f7
parent62ebd002d990c24be989c33aa60719ed5a9ba761 (diff)
parent3625d83cd9811832885090c935055e15fcfa40ef (diff)
Merge pull request #14753 from Rushor/Ihaveadream
DB/Quest: No Mere Dream
-rw-r--r--sql/updates/world/2015_08_24_03_world.sql7
-rw-r--r--src/server/scripts/Kalimdor/zone_moonglade.cpp2
2 files changed, 9 insertions, 0 deletions
diff --git a/sql/updates/world/2015_08_24_03_world.sql b/sql/updates/world/2015_08_24_03_world.sql
new file mode 100644
index 00000000000..ce03049c9a9
--- /dev/null
+++ b/sql/updates/world/2015_08_24_03_world.sql
@@ -0,0 +1,7 @@
+-- [Quest] No Mere Dream
+UPDATE `smart_scripts` SET `event_phase_mask`=0 WHERE `entryorguid`=22834 AND `source_type`=0 AND `id`=1 AND `link`=2;
+UPDATE `smart_scripts` SET `event_phase_mask`=0 WHERE `entryorguid`=22834 AND `source_type`=0 AND `id`=2 AND `link`=0;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry` IN (22834) AND `SourceId`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22,2,22834,0,0,1,0,39601,1,0,1,0,'','Event SAI triggred only if the player don''t have the aura 39601');
+UPDATE `creature_template` SET `flags_extra`=0 WHERE `entry`=22916;
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index 704fefe2678..163620230ef 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -384,6 +384,8 @@ public:
}
PlayerGUID = player->GetGUID();
Start(true, false, PlayerGUID);
+ me->SetDisplayId(me->GetCreatureTemplate()->Modelid1);
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
}
return;
}