From 8e44b2d4a6bfe957df98cfb22ecff818138c32c7 Mon Sep 17 00:00:00 2001 From: Trista Date: Sat, 9 Mar 2013 05:23:50 +0200 Subject: [PATCH] Scripts/Eye of Eternity: Remove some uneeded check and last to do that is uneeded after last GO changes * also repair some broken GO data for 3.3.5a. --- .../world/2013_03_09_01_world_gameobject_template.sql | 2 ++ .../scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 5 ----- .../Nexus/EyeOfEternity/instance_eye_of_eternity.cpp | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 sql/updates/world/2013_03_09_01_world_gameobject_template.sql diff --git a/sql/updates/world/2013_03_09_01_world_gameobject_template.sql b/sql/updates/world/2013_03_09_01_world_gameobject_template.sql new file mode 100644 index 00000000000..229ad5f49a5 --- /dev/null +++ b/sql/updates/world/2013_03_09_01_world_gameobject_template.sql @@ -0,0 +1,2 @@ +-- Update some gameobject data that is correct in WDB, but parsed wrong for some reason +UPDATE `gameobject_template` SET `faction`=35,`data17`=1,`data18`=0 WHERE `entry`=193908; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 6f50dbc427a..bafd9a4510b 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -19,11 +19,6 @@ SDName: Boss Malygos Script Data End */ -/* Main problem needing most attention: - Add support for using Exit Portal while on drake which means to - find seat flag that allows casting on passenger or something that - will prevent valid target filtering. */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "SpellScript.h" 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 a4b688394fb..806152f3826 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 @@ -162,8 +162,7 @@ public: // This fix not being able to press release button. // Variation of this with some check needs to be implemented somewhere within core code. // It'll stay here until someone find where and why the leak happens. - if (Player* dyingPlayer = unit->ToPlayer()) - dyingPlayer->StopMoving(); + dyingPlayer->StopMoving(); } void ProcessEvent(WorldObject* /*obj*/, uint32 eventId)