13 files changed, 920 insertions, 5 deletions

diff --git a/sql/updates/world/2015_03_16_00_world.sql b/sql/updates/world/2015_03_16_00_world.sql
new file mode 100644
index 00000000000..123bd8511cd
--- /dev/null
+++ b/sql/updates/world/2015_03_16_00_world.sql
@@ -0,0 +1,59 @@
+-- 
+-- Legacki SAI
+SET @ENTRY := 10978;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,8,0,100,0,17166,0,0,0,80,1097800,2,0,0,0,0,1,0,0,0,0,0,0,0,"Legacki - On Spellhit 'Release Umi's Yeti' - Run Script"),
+(@ENTRY,0,1,0,40,0,100,0,15,10978,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Legacki - On Waypoint 15 Reached - Run Script");
+-- Actionlist SAI
+SET @ENTRY := 1097800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,53,1,10978,0,0,0,2,1,0,0,0,0,0,0,0,"On Script - Start Waypoint"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1");
+-- Actionlist SAI
+SET @ENTRY := 1097801;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 2"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 3"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 4");
+DELETE FROM `creature_text` WHERE `entry`=10978;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10978, 0, 0, '%s jumps in fright!', 16, 0, 100, 0, 0, 0, 6301, 0, 'Legacki'),
+(10978, 1, 0, 'Ahhhhh!!!', 12, 0, 100, 0, 0, 0, 6302, 0, 'Legacki'),
+(10978, 2, 0, 'You big meanie! Who put you up to this?', 12, 0, 100, 0, 0, 0, 6303, 0, 'Legacki'),
+(10978, 3, 0, 'It was Umi, wasn''t it?! She''s always playing jokes on me, and now she''s got you in on it too!', 12, 0, 100, 0, 0, 0, 6304, 0, 'Legacki'),
+(10978, 4, 0, '%s sighs.', 16, 0, 100, 0, 0, 0, 6305, 0, 'Legacki');
+-- Umi's Mechanical Yeti SAI
+SET @ENTRY := 10980;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,54,0,100,0,0,0,0,0,29,5,10,0,0,0,0,19,10978,10,0,0,0,0,0,"Umi's Mechanical Yeti - On Just Summoned - Start Follow Closest Creature 'Legacki'"),
+(@ENTRY,0,1,3,61,0,100,0,0,0,0,0,1,0,1000,0,0,0,0,1,0,0,0,0,0,0,0,"Umi's Mechanical Yeti - On Just Summoned - Say Line 0"),
+(@ENTRY,0,2,0,52,0,100,0,0,10980,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Umi's Mechanical Yeti - On Text 0 Over - Say Line 1"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,41,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Umi's Mechanical Yeti - On Just Summoned - Despawn In 30000 ms");
+DELETE FROM `creature_text` WHERE `entry`=10980;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10980, 0, 0, '%s marches around, roaring and making a ruckus.', 16, 0, 100, 0, 0, 0, 6327, 0, 'Umi\'s Mechanical Yeti'),
+(10980, 1, 0, 'RAAAAAAAR!', 12, 0, 100, 0, 0, 0, 6329, 0, 'Umi\'s Mechanical Yeti');
+DELETE FROM `waypoints` WHERE `entry`=10978;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(10978, 1,6713.694,-4682.374,721.6163, 'Legacki'),
+(10978, 2,6731.523,-4675.635,721.2076, 'Legacki'),
+(10978, 3,6736.806,-4672.955,721.9132, 'Legacki'),
+(10978, 4,6749.889,-4662.13,725.0011, 'Legacki'),
+(10978, 5,6750.157,-4661.562,724.9875, 'Legacki'),
+(10978, 6,6732.859,-4641.781,722.8784, 'Legacki'),
+(10978, 7,6727.719,-4641.233,721.6862, 'Legacki'),
+(10978, 8,6715.982,-4643.644,721.1971, 'Legacki'),
+(10978, 9,6719.307,-4652.817,721.231, 'Legacki'),
+(10978, 10,6715.004,-4685.518,721.466, 'Legacki'),
+(10978, 11,6718.75,-4705.675,721.9097, 'Legacki'),
+(10978, 12,6712.263,-4717.947,721.5077, 'Legacki'),
+(10978, 13,6701.636,-4714.284,721.6529, 'Legacki'),
+(10978, 14,6701.108,-4695.846,722.3613, 'Legacki'),
+(10978, 15,6705.608,-4686.181,721.9736, 'Legacki');
diff --git a/sql/updates/world/2015_03_16_01_world.sql b/sql/updates/world/2015_03_16_01_world.sql
new file mode 100644
index 00000000000..c6ecea91784
--- /dev/null
+++ b/sql/updates/world/2015_03_16_01_world.sql
@@ -0,0 +1,33 @@
+-- 
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=11192;
+-- Kilram SAI
+SET @ENTRY := 11192;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,20,0,100,0,28626,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Kilram - On Quest 'Tree Delivery' Finished - Run Script");
+-- Actionlist SAI
+SET @ENTRY := 1119200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,12,49191,2,60000,0,0,0,8,0,0,0,6775.828613,-4670.644531,723.81134,2.01846,"On Script - Summon Creature 'Kilram's Tree'"),
+(@ENTRY,9,2,0,0,0,100,0,5000,5000,0,0,11,91827,0,0,0,0,0,19,49191,20,0,0,0,0,0,"On Script - Cast 'Bolder'"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1");
+-- Kilram's Tree SAI
+SET @ENTRY := 49191;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,54,0,100,0,0,0,0,0,11,49191,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kilram's Tree - On Just Summoned - Cast '7th Legion Chain Gun'"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Kilram's Tree - On Just Summoned - Run Script");
+-- Actionlist SAI
+SET @ENTRY := 4919100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,6000,6000,0,0,5,445,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kilram's Tree - On Script - Play Emote 445"),
+(@ENTRY,9,1,0,0,0,100,0,12000,12000,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kilram's Tree - On Script - Despawn Instant");
+DELETE FROM `creature_text` WHERE `entry`=11192;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(11192, 0, 0, 'Why flail around when all you need...', 12, 0, 100, 0, 0, 0, 49308, 0, 'Kilram\'s Tree'),
+(11192, 1, 0, '...is just one CHOP!', 12, 0, 100, 0, 0, 0, 49309, 0, 'Kilram\'s Tree');
diff --git a/sql/updates/world/2015_03_16_02_world.sql b/sql/updates/world/2015_03_16_02_world.sql
new file mode 100644
index 00000000000..292f80c7401
--- /dev/null
+++ b/sql/updates/world/2015_03_16_02_world.sql
@@ -0,0 +1,34 @@
+-- 
+UPDATE `creature_template` SET `ScriptName`='' WHERE  `entry`=11191;
+
+-- Lilith the Lithe SAI 
+SET @ENTRY := 11191;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,20,0,100,0,28618,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Lilith the Lithe - On Quest 'Boulder Delivery' Finished - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1119100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,12,49149,2,90000,0,0,0,8,0,0,0,6775.828613,-4670.644531,723.81134,2.01846,"On Script - Summon Creature 'Instant Boulder'"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,11,91667,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Bolder'"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,11,91667,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Bolder'"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,11,91667,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Bolder'"),
+(@ENTRY,9,5,0,0,0,100,0,1000,1000,0,0,11,91671,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Bolder'"),
+(@ENTRY,9,6,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1");
+
+-- Instant Boulder SAI
+SET @ENTRY := 49149;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,54,0,100,0,0,0,0,0,11,91601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Instant Boulder - On Just Summoned - Cast 'Bolder'"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Instant Boulder - On Just Summoned - Despawn In 6000 ms");
+
+DELETE FROM `creature_text` WHERE `entry`=11191;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(11191, 0, 0, 'Watch and weep.', 12, 0, 100, 0, 0, 0, 49258, 0, 'Lilith the Lithe'),
+(11191, 1, 0, 'You see? Nothing beats the crushing power of my hammers.', 12, 0, 100, 0, 0, 0, 49259, 0, 'Lilith the Lithe');
diff --git a/sql/updates/world/2015_03_16_03_world.sql b/sql/updates/world/2015_03_16_03_world.sql
new file mode 100644
index 00000000000..017ef562ccc
--- /dev/null
+++ b/sql/updates/world/2015_03_16_03_world.sql
@@ -0,0 +1,87 @@
+-- 
+-- Shade of the Spiritspeaker SAI
+SET @ENTRY := 48678;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,0,2000,2000,1500,1500,11,90700,1,0,0,0,0,1,0,0,0,0,0,0,0,"Shade of the Spiritspeaker - Out of Combat - Cast 'Summon Arcane Sphere'"),
+(@ENTRY,0,1,0,0,0,100,0,2000,5000,5000,5000,11,85424,2,0,0,0,0,2,0,0,0,0,0,0,0,"Shade of the Spiritspeaker - In Combat - Cast 'Spirit Burst'");
+DELETE FROM `creature_template_addon` WHERE `entry`=48681;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(48681,0,0,33554432,1,0,'90698');
+-- Arcane Roller SAI
+SET @ENTRY := 48681;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,87,@ENTRY*100+00,@ENTRY*100+01,@ENTRY*100+02,0,0,0,1,0,0,0,0,0,0,0,"Arcane Roller - On Just Summoned - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arcane Roller - On Aggro - Despawn Instant");
+-- Actionlist SAI
+SET @ENTRY := 4868100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,100,100,0,0,53,1,4868100,0,0,1000,0,1,0,0,0,0,0,0,0,"On Script - Start Waypoint");
+-- Actionlist SAI
+SET @ENTRY := 4868101;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,100,100,0,0,53,1,4868101,0,0,1000,0,1,0,0,0,0,0,0,0,"On Script - Start Waypoint");
+-- Actionlist SAI
+SET @ENTRY := 4868102;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,100,100,0,0,53,1,4868102,0,0,1000,0,1,0,0,0,0,0,0,0,"On Script - Start Waypoint");
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=48681;
+UPDATE `creature_template` SET `speed_walk`=2.5, `speed_run`=2.5 WHERE `entry`=48681;
+DELETE FROM `waypoints` WHERE `entry`=4868101;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(4868101, 1, 6195.35, -4111.85, 744.147, 'Arcane Roller'),
+(4868101, 2, 6203.05, -4111.92, 741.04, 'Arcane Roller'),
+(4868101, 3, 6212.6, -4112.66, 735.066, 'Arcane Roller'),
+(4868101, 4, 6228.86, -4114.14, 723.562, 'Arcane Roller'),
+(4868101, 5, 6240.95, -4113.68, 721.984, 'Arcane Roller'),
+(4868101, 6, 6247.91, -4112.89, 721.482, 'Arcane Roller'),
+(4868101, 7, 6261.13, -4110.28, 718.787, 'Arcane Roller'),
+(4868101, 8, 6274.36, -4103.5, 715.604, 'Arcane Roller'),
+(4868101, 9, 6285.37, -4086.53, 710.668, 'Arcane Roller'),
+(4868101, 10, 6293.89, -4064.3, 703.658, 'Arcane Roller'),
+(4868101, 11, 6303.82, -4052.11, 701.461, 'Arcane Roller'),
+(4868101, 12, 6315.01, -4049.11, 698.762, 'Arcane Roller'),
+(4868101, 13, 6331.43, -4046.85, 697.436, 'Arcane Roller'),
+(4868101, 14, 6354.13, -4042.56, 694.022, 'Arcane Roller'),
+(4868101, 15, 6360.85, -4041.71, 686.905, 'Arcane Roller'),
+(4868101, 16, 6378.82, -4041.17, 664.861, 'Arcane Roller');
+DELETE FROM `waypoints` WHERE `entry`=4868100;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(4868100, 1, 6196.32, -4105.12, 744.028, 'Arcane Roller'),
+(4868100, 2, 6206.79, -4105.92, 739.795, 'Arcane Roller'),
+(4868100, 3, 6217.26, -4106.65, 732.59, 'Arcane Roller'),
+(4868100, 4, 6229.98, -4107.5, 723.776, 'Arcane Roller'),
+(4868100, 5, 6241.76, -4107.84, 722.284, 'Arcane Roller'),
+(4868100, 6, 6251.8, -4107.76, 721.797, 'Arcane Roller'),
+(4868100, 7, 6265.56, -4100.52, 716.464, 'Arcane Roller'),
+(4868100, 8, 6272.71, -4094.95, 713.936, 'Arcane Roller'),
+(4868100, 9, 6277.71, -4084.69, 711.392, 'Arcane Roller'),
+(4868100, 10, 6282.68, -4072.6, 708.661, 'Arcane Roller'),
+(4868100, 11, 6290.79, -4054.63, 704.589, 'Arcane Roller'),
+(4868100, 12, 6298.65, -4047.94, 703.035, 'Arcane Roller'),
+(4868100, 13, 6310.25, -4044.52, 699.736, 'Arcane Roller'),
+(4868100, 14, 6323.37, -4041.15, 697.811, 'Arcane Roller'),
+(4868100, 15, 6345.7, -4034.72, 695.33, 'Arcane Roller'),
+(4868100, 16, 6355.44, -4032.31, 690.346, 'Arcane Roller'),
+(4868100, 17, 6377.85, -4026.08, 664.858, 'Arcane Roller');
+DELETE FROM `waypoints` WHERE `entry`=4868102;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(4868102, 1, 6195.2, -4118.27, 743.577, 'Arcane Roller'),
+(4868102, 2, 6202.19, -4118.49, 740.402, 'Arcane Roller'),
+(4868102, 3, 6214.4, -4120.41, 732.631, 'Arcane Roller'),
+(4868102, 4, 6229.96, -4123.08, 723.281, 'Arcane Roller'),
+(4868102, 5, 6241.04, -4121.34, 721.329, 'Arcane Roller'),
+(4868102, 6, 6254.89, -4119.31, 720.073, 'Arcane Roller'),
+(4868102, 7, 6275.18, -4112.21, 716.654, 'Arcane Roller'),
+(4868102, 8, 6286.03, -4103.33, 714.633, 'Arcane Roller'),
+(4868102, 9, 6296.62, -4080.74, 706.334, 'Arcane Roller'),
+(4868102, 10, 6313.36, -4054.73, 698.949, 'Arcane Roller'),
+(4868102, 11, 6344.67, -4053.76, 695.791, 'Arcane Roller'),
+(4868102, 12, 6353.26, -4052.85, 693.859, 'Arcane Roller'),
+(4868102, 13, 6389.22, -4047.54, 658.284, 'Arcane Roller');
diff --git a/sql/updates/world/2015_03_16_04_world.sql b/sql/updates/world/2015_03_16_04_world.sql
new file mode 100644
index 00000000000..099715b23b2
--- /dev/null
+++ b/sql/updates/world/2015_03_16_04_world.sql
@@ -0,0 +1,254 @@
+-- 
+-- Pathing for Entry: 7453 'TDB FORMAT'
+SET @NPC := 277263;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=7137.471,`position_y`=-4932.94,`position_z`=709.7938 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,7137.471,-4932.94,709.7938,0,0,0,0,100,0),
+(@PATH,2,7116.508,-4952.124,712.9629,0,0,0,0,100,0),
+(@PATH,3,7105.256,-4976.592,718.3862,0,0,0,0,100,0);
+-- 0x1C3998002007474000008A0000666599 .go 7137.471 -4932.94 709.7938
+-- Pathing for Entry: 7453 'TDB FORMAT'
+SET @NPC := 277262;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=7105.344,`position_y`=-4976.538,`position_z`=718.2935 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,7105.344,-4976.538,718.2935,0,0,0,0,100,0),
+(@PATH,2,7103.528,-4980.293,718.7722,0,0,0,0,100,0),
+(@PATH,3,7061.037,-5037.344,712.4945,0,0,0,0,100,0),
+(@PATH,4,7089.595,-5007.938,718.2341,0,0,0,0,100,0),
+(@PATH,5,7100.142,-4988.004,718.8002,0,0,0,0,100,0),
+(@PATH,6,7115.443,-4953.817,713.5366,0,0,0,0,100,0),
+(@PATH,7,7133.554,-4937.197,710.8986,0,0,0,0,100,0),
+(@PATH,8,7157.135,-4911.291,707.8239,0,0,0,0,100,0),
+(@PATH,9,7170.106,-4886.438,703.9925,0,0,0,0,100,0),
+(@PATH,10,7189.345,-4858.223,699.2946,0,0,0,0,100,0),
+(@PATH,11,7172.859,-4881.475,703.1406,0,0,0,0,100,0),
+(@PATH,12,7159.049,-4908.233,707.64,0,0,0,0,100,0),
+(@PATH,13,7137.446,-4933.033,709.887,0,0,0,0,100,0),
+(@PATH,14,7116.485,-4952.148,712.9681,0,0,0,0,100,0),
+(@PATH,15,7105.237,-4976.608,718.3914,0,0,0,0,100,0),
+(@PATH,16,7103.582,-4980.233,718.576,0,0,0,0,100,0);
+-- 0x1C3998002007474000008A0000666599 .go 7105.344 -4976.538 718.2935
+DELETE FROM `creature_addon` WHERE `guid` IN (277512, 277520, 277514);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(277512, 0, 0, 0, 0, 1, NULL),
+(277520, 0, 0, 0, 0, 1, NULL),
+(277514, 0, 0, 0, 0, 1, NULL);
+-- Pathing for Entry: 7458 'TDB FORMAT'
+SET @NPC := 276911;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6566.325,`position_y`=-5201.914,`position_z`=764.9429 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,6566.325,-5201.914,764.9429,0,0,0,0,100,0),
+(@PATH,2,6575.174,-5177.188,769.7847,0,0,0,0,100,0),
+(@PATH,3,6564.959,-5128.947,770.9417,0,0,0,0,100,0),
+(@PATH,4,6575.966,-5172.782,769.9459,0,0,0,0,100,0),
+(@PATH,5,6568.467,-5194.482,766.7494,0,0,0,0,100,0),
+(@PATH,6,6578.56,-5207.592,766.5796,0,0,0,0,100,0),
+(@PATH,7,6606.4,-5208.795,766.1869,0,0,0,0,100,0),
+(@PATH,8,6629.916,-5221.93,761.009,0,0,0,0,100,0),
+(@PATH,9,6644.289,-5255.269,752.8387,0,0,0,0,100,0),
+(@PATH,10,6641.589,-5279.789,753.8105,0,0,0,0,100,0),
+(@PATH,11,6645.497,-5260.147,753.0979,0,0,0,0,100,0),
+(@PATH,12,6633.773,-5226.286,759.0981,0,0,0,0,100,0),
+(@PATH,13,6614.56,-5210.234,765.7307,0,0,0,0,100,0),
+(@PATH,14,6589.438,-5210.639,767.4576,0,0,0,0,100,0),
+(@PATH,15,6566.303,-5201.964,764.929,0,0,0,0,100,0),
+(@PATH,16,6575.107,-5177.374,769.6774,0,0,0,0,100,0);
+-- 0x1C3998002007488000008A000064E93B .go 6566.325 -5201.914 764.9429
+-- Pathing for Entry: 10807 'TDB FORMAT'
+SET @NPC := 276740;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5648.751,`position_y`=-4618.699,`position_z`=771.1746 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,5648.751,-4618.699,771.1746,0,0,0,0,100,0),
+(@PATH,2,5689.12,-4680.393,778.8788,0,0,0,0,100,0),
+(@PATH,3,5701.02,-4691.902,780.7781,0,0,0,0,100,0),
+(@PATH,4,5709.774,-4700.304,780.6177,0,0,0,0,100,0),
+(@PATH,5,5739.681,-4724.907,777.1263,0,0,0,0,100,0),
+(@PATH,6,5761.202,-4736.823,776.7352,0,0,0,0,100,0),
+(@PATH,7,5788.845,-4754.466,776.5774,0,0,0,0,100,0),
+(@PATH,8,5813.559,-4749.592,770.7727,0,0,0,0,100,0),
+(@PATH,9,5846.619,-4732.072,761.0168,0,0,0,0,100,0),
+(@PATH,10,5855.859,-4703.766,758.3209,0,0,0,0,100,0),
+(@PATH,11,5863.439,-4687.21,757.4078,0,0,0,0,100,0),
+(@PATH,12,5873.563,-4665.864,752.4548,0,0,0,0,100,0),
+(@PATH,13,5900.618,-4633.269,736.8805,0,0,0,0,100,0),
+(@PATH,14,5914.753,-4606.957,729.6884,0,0,0,0,100,0),
+(@PATH,15,5936.95,-4569.866,717.9836,0,0,0,0,100,0),
+(@PATH,16,5950.268,-4542.576,715.5675,0,0,0,0,100,0),
+(@PATH,17,5955.396,-4527.396,713.515,0,0,0,0,100,0),
+(@PATH,18,5961.662,-4503.704,710.3988,0,0,0,0,100,0),
+(@PATH,19,5967.232,-4485.815,706.7623,0,0,0,0,100,0),
+(@PATH,20,5979.453,-4458.936,707.3737,0,0,0,0,100,0),
+(@PATH,21,6006.054,-4422.591,708.9871,0,0,0,0,100,0),
+(@PATH,22,6014.302,-4408.834,711.2253,0,0,0,0,100,0),
+(@PATH,23,6020.136,-4398.585,712.5538,0,0,0,0,100,0),
+(@PATH,24,6029.516,-4378.594,715.494,0,0,0,0,100,0),
+(@PATH,25,6051.132,-4358.396,716.563,0,0,0,0,100,0),
+(@PATH,26,6069.048,-4337.034,722.8481,0,0,0,0,100,0),
+(@PATH,27,6083.582,-4330.367,725.8171,0,0,0,0,100,0),
+(@PATH,28,6113.54,-4323.066,733.0433,0,0,0,0,100,0),
+(@PATH,29,6130.411,-4316.812,736.7444,0,0,0,0,100,0),
+(@PATH,30,6156.093,-4311.238,736.7893,0,0,0,0,100,0),
+(@PATH,31,6213.947,-4293.813,733.0521,0,0,0,0,100,0),
+(@PATH,32,6215.008,-4264.572,735.2877,0,0,0,0,100,0),
+(@PATH,33,6226.857,-4249.232,738.0566,0,0,0,0,100,0),
+(@PATH,34,6253.248,-4226.368,735.1916,0,0,0,0,100,0),
+(@PATH,35,6273.733,-4225.47,727.8517,0,0,0,0,100,0),
+(@PATH,36,6284.836,-4225.425,726.1979,0,0,0,0,100,0),
+(@PATH,37,6305.368,-4225.753,725.4176,0,0,0,0,100,0),
+(@PATH,38,6334.949,-4217.311,720.7787,0,0,0,0,100,0),
+(@PATH,39,6351.212,-4210.416,716.0107,0,0,0,0,100,0),
+(@PATH,40,6376.162,-4192.59,707.6775,0,0,0,0,100,0),
+(@PATH,41,6395.101,-4179.662,703.7349,0,0,0,0,100,0),
+(@PATH,42,6381.396,-4188.968,706.1343,0,0,0,0,100,0),
+(@PATH,43,6353.885,-4208.841,714.7299,0,0,0,0,100,0),
+(@PATH,44,6338.441,-4215.688,719.8574,0,0,0,0,100,0),
+(@PATH,45,6314.177,-4224.836,724.3856,0,0,0,0,100,0),
+(@PATH,46,6301.717,-4225.433,725.8468,0,0,0,0,100,0),
+(@PATH,47,6275.718,-4225.523,727.0695,0,0,0,0,100,0),
+(@PATH,48,6255.941,-4225.716,734.1918,0,0,0,0,100,0),
+(@PATH,49,6235.572,-4239.381,738.0726,0,0,0,0,100,0),
+(@PATH,50,6217.472,-4260.318,736.3972,0,0,0,0,100,0),
+(@PATH,51,6214.817,-4292.466,733.4384,0,0,0,0,100,0),
+(@PATH,52,6183.471,-4306.068,736.7473,0,0,0,0,100,0),
+(@PATH,53,6152.146,-4311.395,736.5862,0,0,0,0,100,0),
+(@PATH,54,6115.85,-4322.032,733.5704,0,0,0,0,100,0),
+(@PATH,55,6096.116,-4326.589,726.9081,0,0,0,0,100,0),
+(@PATH,56,6072.762,-4334.344,723.8291,0,0,0,0,100,0),
+(@PATH,57,6054.525,-4355.155,717.3843,0,0,0,0,100,0),
+(@PATH,58,6045.726,-4362.94,715.9363,0,0,0,0,100,0),
+(@PATH,59,6022.907,-4393.988,713.5073,0,0,0,0,100,0),
+(@PATH,60,6016.278,-4405.039,711.9446,0,0,0,0,100,0),
+(@PATH,61,6008.032,-4420.086,709.5507,0,0,0,0,100,0),
+(@PATH,62,5986.144,-4448.363,708.0036,0,0,0,0,100,0),
+(@PATH,63,5973.533,-4469.824,706.2904,0,0,0,0,100,0),
+(@PATH,64,5962.696,-4501.021,709.6469,0,0,0,0,100,0),
+(@PATH,65,5958.108,-4519.2,712.8943,0,0,0,0,100,0),
+(@PATH,66,5951.027,-4540.779,715.1692,0,0,0,0,100,0),
+(@PATH,67,5940.734,-4563.251,716.6089,0,0,0,0,100,0),
+(@PATH,68,5916.599,-4603.511,727.8939,0,0,0,0,100,0),
+(@PATH,69,5903.969,-4628.674,735.8933,0,0,0,0,100,0),
+(@PATH,70,5876.024,-4662.081,750.1125,0,0,0,0,100,0),
+(@PATH,71,5866.109,-4682.41,756.9871,0,0,0,0,100,0),
+(@PATH,72,5860.89,-4692.448,757.6022,0,0,0,0,100,0),
+(@PATH,73,5852.626,-4718.677,760.3339,0,0,0,0,100,0),
+(@PATH,74,5816.978,-4747.931,769.589,0,0,0,0,100,0),
+(@PATH,75,5794.675,-4756.42,776.863,0,0,0,0,100,0),
+(@PATH,76,5787.91,-4753.686,776.4739,0,0,0,0,100,0),
+(@PATH,77,5742.113,-4726.395,776.4882,0,0,0,0,100,0),
+(@PATH,78,5717.964,-4712.427,780.866,0,0,0,0,100,0),
+(@PATH,79,5716.192,-4711.237,780.9797,0,0,0,0,100,0),
+(@PATH,80,5691.473,-4682.99,779.7195,0,0,0,0,100,0),
+(@PATH,81,5679.313,-4650.769,771.5784,0,0,0,0,100,0),
+(@PATH,82,5678.228,-4647.97,771.2499,0,0,0,0,100,0),
+(@PATH,83,5626.609,-4580.739,771.4092,0,0,0,0,100,0),
+(@PATH,84,5622.033,-4555.714,764.3365,0,0,0,0,100,0),
+(@PATH,85,5614.873,-4538.934,761.8027,0,0,0,0,100,0),
+(@PATH,86,5588.495,-4500.353,760.0676,0,0,0,0,100,0),
+(@PATH,87,5564.071,-4494.821,758.7393,0,0,0,0,100,0),
+(@PATH,88,5576.771,-4495.759,759.148,0,0,0,0,100,0),
+(@PATH,89,5600.532,-4515.448,761.4238,0,0,0,0,100,0),
+(@PATH,90,5620.198,-4550.56,763.2811,0,0,0,0,100,0),
+(@PATH,91,5624.978,-4576.957,770.4901,0,0,0,0,100,0),
+(@PATH,92,5645.084,-4612.734,771.1481,0,0,0,0,100,0),
+(@PATH,93,5648.815,-4618.739,771.1803,0,0,0,0,100,0),
+(@PATH,94,5689.149,-4680.177,778.8832,0,0,0,0,100,0),
+(@PATH,95,5700.999,-4691.828,780.7064,0,0,0,0,100,0),
+(@PATH,96,5709.821,-4700.319,780.6168,0,0,0,0,100,0);
+-- 0x1C399800200A8DC000008A0000666232 .go 5648.751 -4618.699 771.1746
+-- Pathing for Entry: 11754 'TDB FORMAT'
+SET @NPC := 277014;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6720.784,`position_y`=-4657.231,`position_z`=721.1815 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,6720.784,-4657.231,721.1815,0,0,0,0,100,0),
+(@PATH,2,6712.688,-4694.593,721.6722,0,0,0,0,100,0),
+(@PATH,3,6742.375,-4669.703,722.5077,0,0,0,0,100,0),
+(@PATH,4,6751.504,-4670.746,723.8561,0,0,0,0,100,0),
+(@PATH,5,6750.167,-4670.442,723.4701,0,0,0,0,100,0),
+(@PATH,6,6729.87,-4670.181,721.3218,0,0,0,0,100,0),
+(@PATH,7,6723.56,-4670.309,721.1548,0,0,0,0,100,0),
+(@PATH,8,6712.701,-4694.66,721.6473,0,0,0,0,100,0),
+(@PATH,9,6720.992,-4656.926,721.0239,0,0,0,0,100,0),
+(@PATH,10,6727.398,-4634.59,721.2974,0,0,0,0,100,0),
+(@PATH,11,6727.289,-4634.758,721.0771,0,0,0,0,100,0),
+(@PATH,12,6727.393,-4634.646,721.2531,0,0,0,0,100,0),
+(@PATH,13,6720.8,-4657.175,721.1818,0,0,0,0,100,0);
+-- 0x1C399800200B7A8000003C00005D1BC1 .go 6720.784 -4657.231 721.1815
+-- Pathing for Entry: 11190 'TDB FORMAT'
+SET @NPC := 277021;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6718.815,`position_y`=-4649.531,`position_z`=721.1697 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,6718.815,-4649.531,721.1697,0,0,0,0,100,0),
+(@PATH,2,6718.783,-4649.535,721.4225,0,0,0,0,100,0),
+(@PATH,3,6719.614,-4656.521,721.302,0,0,0,0,100,0),
+(@PATH,4,6717,-4663.771,721.069,0,0,0,0,100,0),
+(@PATH,5,6716.95,-4663.692,720.99,0,0,0,0,100,0),
+(@PATH,6,6717.275,-4663.325,721.0589,0,0,0,0,100,0);
+-- 0x1C399800200AED8000003C00005AED84 .go 6718.815 -4649.531 721.1697
+-- Pathing for Entry: 11190 'TDB FORMAT'
+SET @NPC := 277061;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6728.219,`position_y`=-4670.128,`position_z`=721.2576 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,6728.219,-4670.128,721.2576,0,0,0,0,100,0),
+(@PATH,2,6743.886,-4670.578,722.9776,0,0,0,0,100,0),
+(@PATH,3,6756.655,-4670.659,724.0643,0,0,0,0,100,0),
+(@PATH,4,6757.912,-4670.535,724.0609,0,0,0,0,100,0),
+(@PATH,5,6742.673,-4666.933,722.8669,0,0,0,0,100,0),
+(@PATH,6,6736.266,-4663.654,721.8529,0,0,0,0,100,0),
+(@PATH,7,6733.673,-4655.659,721.4637,0,0,0,0,100,0),
+(@PATH,8,6734.015,-4654.013,721.61,0,0,0,0,100,0),
+(@PATH,9,6738.349,-4643.12,721.8862,0,0,0,0,100,0),
+(@PATH,10,6749.037,-4650.289,724.4041,0,0,0,0,100,0),
+(@PATH,11,6749.985,-4651.393,724.5129,0,0,0,0,100,0),
+(@PATH,12,6747.223,-4666.195,724.0955,0,0,0,0,100,0),
+(@PATH,13,6742.063,-4667.552,722.8929,0,0,0,0,100,0),
+(@PATH,14,6733.769,-4665.354,721.3834,0,0,0,0,100,0),
+(@PATH,15,6732.711,-4664.764,721.2361,0,0,0,0,100,0),
+(@PATH,16,6725.651,-4656.119,721.0077,0,0,0,0,100,0),
+(@PATH,17,6723.583,-4648.15,721.3789,0,0,0,0,100,0),
+(@PATH,18,6725.607,-4639.14,721.3022,0,0,0,0,100,0),
+(@PATH,19,6725.688,-4618.812,721.2241,0,0,0,0,100,0),
+(@PATH,20,6726.158,-4620.798,721.011,0,0,0,0,100,0),
+(@PATH,21,6725.985,-4632.64,721.314,0,0,0,0,100,0),
+(@PATH,22,6722.886,-4647.297,721.2972,0,0,0,0,100,0),
+(@PATH,23,6719.054,-4660.822,721.2487,0,0,0,0,100,0),
+(@PATH,24,6718.09,-4669.577,721.0381,0,0,0,0,100,0),
+(@PATH,25,6717.658,-4679.682,721.2125,0,0,0,0,100,0),
+(@PATH,26,6714.254,-4691.013,721.465,0,0,0,0,100,0),
+(@PATH,27,6718.247,-4679.584,721.3595,0,0,0,0,100,0),
+(@PATH,28,6724.794,-4671.702,721.1953,0,0,0,0,100,0),
+(@PATH,29,6728.427,-4670.179,721.2579,0,0,0,0,100,0),
+(@PATH,30,6743.787,-4670.586,722.9696,0,0,0,0,100,0),
+(@PATH,31,6756.599,-4670.691,724.1053,0,0,0,0,100,0),
+(@PATH,32,6757.838,-4670.533,724.0765,0,0,0,0,100,0),
+(@PATH,33,6742.766,-4666.877,722.8699,0,0,0,0,100,0);
+-- 0x1C399800200AED8000003C0001DAED84 .go 6728.219 -4670.128 721.2576
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid` IN (277028, 277016, 277002);
+UPDATE `creature` SET `spawndist`=10, `MovementType`=1 WHERE `guid` IN (277004);
diff --git a/sql/updates/world/2015_03_16_05_world.sql b/sql/updates/world/2015_03_16_05_world.sql
new file mode 100644
index 00000000000..b577abe05e7
--- /dev/null
+++ b/sql/updates/world/2015_03_16_05_world.sql
@@ -0,0 +1,143 @@
+-- 
+DELETE FROM `creature` WHERE  `guid` IN (273379, 278282);
+DELETE FROM `creature_template_addon` WHERE  `entry`=50374;
+UPDATE `creature` SET `position_x`=1704.6558, `position_y`=1698.945, `position_z`=134.2911, `orientation`=1.6375 WHERE  `guid`=325069;
+DELETE FROM `creature` WHERE  `guid` IN (@GUID, @GUID+1);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `PhaseId`, `PhaseGroup`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES 
+(273379, 50373, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1695.84, 1688.49, 135.279, 6.15358, 300, 0, 0, 42, 0, 0, 0, 0, 0, 0),
+(278282, 50373, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1707.56, 1702.21, 133.969, 4.64955, 300, 0, 0, 42, 0, 0, 0, 0, 0, 0);
+
+-- Aradne SAI
+SET @ENTRY := 50372;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,50372,1,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,2,50372,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Waypoint 2 Reached - Run Script"),
+(@ENTRY,0,2,0,40,0,100,0,4,50372,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,18,50372,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Waypoint 18 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,25,50372,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Waypoint 25 Reached - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 5037200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,11,93446,0,0,0,0,0,19,50373,5,0,0,0,0,0,"Aradne - On Script - Cast 'Raise Undead'"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Aradne - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,50373,10,0,0,0,0,0,"Aradne - On Script - Set Data 1 1");
+
+-- Deathknell Grave Target SAI
+SET @ENTRY := 50373;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,11,93447,2,0,0,0,0,1,0,0,0,0,0,0,0,"Deathknell Grave Target - On Data Set 1 1 - Cast '<Spell not found!>'"),
+(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,47,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Deathknell Grave Target - On Reset - Set Visibility Off");
+
+DELETE FROM `creature_text` WHERE `entry`=50372;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(50372, 0, 0, 'You are returned to life. The Banshee Queen asks for your service.', 12, 0, 100, 0, 0, 0, 0, 0, 'Aradne'),
+(50372, 0, 1, 'Rise from the grave and serve the Dark Lady!', 12, 0, 100, 0, 0, 0, 0, 0, 'Aradne'),
+(50372, 0, 2, 'Waken, sleeper. Your new life awaits.', 12, 0, 100, 0, 0, 0, 0, 0, 'Aradne');
+
+DELETE FROM `waypoints` WHERE `entry`=50372;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(50372, 1, 1698.53, 1687.82, 134.825, 'Aradne'),
+(50372, 2, 1696.9, 1688.16, 135.093, 'Aradne'),
+(50372, 3, 1696.82, 1680.22, 134.648, 'Aradne'),
+(50372, 4, 1695.54, 1680.51, 134.857, 'Aradne'),
+(50372, 5, 1694.45, 1675.17, 134.582, 'Aradne'),
+(50372, 6, 1691.49, 1672.14, 134.725, 'Aradne'),
+(50372, 7, 1686.68, 1671.13, 135.499, 'Aradne'),
+(50372, 8, 1683.32, 1672.1, 136.382, 'Aradne'),
+(50372, 9, 1676.21, 1673.95, 137.504, 'Aradne'),
+(50372, 10, 1672.78, 1674.63, 138.265, 'Aradne'),
+(50372, 11, 1671.65, 1680.4, 139.247, 'Aradne'),
+(50372, 12, 1672.95, 1685.73, 139.639, 'Aradne'),
+(50372, 13, 1673.6, 1688.58, 139.695, 'Aradne'),
+(50372, 14, 1675.72, 1697.68, 140.331, 'Aradne'),
+(50372, 15, 1682.36, 1695.94, 138.045, 'Aradne'),
+(50372, 16, 1688.03, 1692.28, 137.092, 'Aradne'),
+(50372, 17, 1686.76, 1686.93, 137.07, 'Aradne'),
+(50372, 18, 1683.31, 1686.49, 137.777, 'Aradne'),
+(50372, 19, 1688.84, 1685.97, 136.565, 'Aradne'),
+(50372, 20, 1701.76, 1685.93, 134.241, 'Aradne'),
+(50372, 21, 1701.76, 1685.93, 134.241, 'Aradne'),
+(50372, 22, 1708.09, 1692.04, 133.826, 'Aradne'),
+(50372, 23, 1707.34, 1696.12, 133.928, 'Aradne'),
+(50372, 24, 1704.29, 1699.33, 134.399, 'Aradne'),
+(50372, 25, 1707.4, 1700.54, 134.079, 'Aradne');
+
+-- Risen Dead SAI
+SET @ENTRY := 50374;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,87,@ENTRY*100+00,@ENTRY*100+01,@ENTRY*100+02,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Just Summoned - Run Random Script");
+
+/* first random script */
+-- Actionlist SAI
+SET @ENTRY := 5037400;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,3,1501,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Morph To Creature Mindless Zombie"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 5"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,75,44427,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Add Aura 'Enrage'"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,53,1,5037400,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Start Waypoint"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,41,9000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Despawn In 9000 ms");
+
+DELETE FROM `waypoints` WHERE `entry`=5037400;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(5037400, 1, 1695.182861, 1672.756714, 134.063858, 'Risen Dead'),
+(5037400, 2, 1669.666260, 1661.953979, 140.546326, 'Risen Dead');
+
+DELETE FROM `creature_text` WHERE `entry`=50372;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `TextRange`, `comment`, `BroadcastTextId`) VALUES 
+(50372, 0, 0, 'Rise from the grave and serve the Dark Lady!', 12, 0, 100, 1, 0, 0, 0, 'Aradne', 50118),
+(50372, 0, 1, 'In the name of Sylvanas, the Banshee Queen, I bestow this gift upon you!', 12, 0, 100, 1, 0, 0, 0, 'Aradne', 50119),
+(50372, 0, 2, 'Rise from death\'s slumber and join your brothers!', 12, 0, 100, 1, 0, 0, 0, 'Aradne', 50120),
+(50372, 0, 3, 'Waken, sleeper. Your new life awaits.', 12, 0, 100, 1, 0, 0, 0, 'Aradne', 50121),
+(50372, 0, 4, 'You are returned to life. The Banshee Queen asks for your service.', 12, 0, 100, 1, 0, 0, 0, 'Aradne', 50122);
+
+DELETE FROM `creature_text` WHERE `entry`=50374;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `TextRange`, `comment`, `BroadcastTextId`) VALUES 
+(50374, 0, 0, 'I never asked for this! Leave me alone!', 12, 0, 100, 5, 0, 0, 0, 'Risen Dead', 50201),
+(50374, 1, 0, 'What magic is this that turn back the hand of death?', 12, 0, 100, 6, 0, 0, 0, 'Risen Dead', 50197),
+(50374, 1, 1, 'This is Lady Sylvanas\'s doing?', 12, 0, 100, 6, 0, 0, 0, 'Risen Dead', 50196),
+(50374, 2, 0, 'If the Banshee Queen has offered me this chance, I will gladly serve.', 12, 0, 100, 1, 0, 0, 0, 'Risen Dead', 50200),
+(50374, 2, 1, 'What use has the Dark Lady for me?', 12, 0, 100, 6, 0, 0, 0, 'Risen Dead', 50199),
+(50374, 3, 0, 'What... what\'s happening to me? Why have you done this to me?', 12, 0, 100, 6, 0, 0, 0, 'Risen Dead', 50194),
+(50374, 3, 1, 'I... I don\'t remember... Why have you done this?', 12, 0, 100, 6, 0, 0, 0, 'Risen Dead', 50198),
+(50374, 4, 0, 'I should be dead and to death I will return!', 12, 0, 100, 5, 0, 0, 0, 'Risen Dead', 50195),
+-- emotes
+(50374, 5, 0, '%s enrages and transforms into a Mindless Zombie and runs away.', 16, 0, 100, 0, 0, 0, 0, 'Risen Dead', 0),
+(50374, 6, 0, '%s commits suicide.', 16, 0, 100, 0, 0, 0, 0, 'Risen Dead', 0),
+(50374, 7, 0, '%s walks off towards the barracks.', 16, 0, 100, 0, 0, 0, 0, 'Risen Dead', 0);
+
+/* second randowm script */
+-- Actionlist SAI
+SET @ENTRY := 5037401;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 1"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 2"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,53,0,5037401,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Start Waypoint"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 7"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,41,9000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Despawn In 9000 ms");
+
+DELETE FROM `waypoints` WHERE `entry`=5037401;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(5037401, 1, 1696.713013, 1674.248047, 134.094315, 'Risen Dead'),
+(5037401, 2, 1696.786987, 1660.868164, 130.983063, 'Risen Dead');
+
+/* third random script */
+-- Actionlist SAI
+SET @ENTRY := 5037402;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 3"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 4"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Say Line 6"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Risen Dead - On Script - Kill Self");
diff --git a/sql/updates/world/2015_03_16_06_world.sql b/sql/updates/world/2015_03_16_06_world.sql
new file mode 100644
index 00000000000..b36f8c6e2d6
--- /dev/null
+++ b/sql/updates/world/2015_03_16_06_world.sql
@@ -0,0 +1,13 @@
+-- 
+SET @GUID := 286259; -- Set by TC
+DELETE FROM `creature` WHERE `guid`=@GUID;
+INSERT INTO `creature` (`guid`, `id`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES
+(@GUID, 49425, 1, 1, 1962.828, 1417.599, 67.46286, 3.560472, 120);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=49425;
+INSERT INTO `creature_template_addon` (`entry`, `bytes1`, `bytes2`, `auras`) VALUES 
+(49425, 65536, 0, "49415");
+
+DELETE FROM `spell_area` WHERE spell=49417 AND AREA=154;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `racemask`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(49417, 154, 24970, 24971, 16, 1, 66, 11);
diff --git a/sql/updates/world/2015_03_16_07_world.sql b/sql/updates/world/2015_03_16_07_world.sql
new file mode 100644
index 00000000000..4078fffad9d
--- /dev/null
+++ b/sql/updates/world/2015_03_16_07_world.sql
@@ -0,0 +1,65 @@
+-- 
+SET @Infiltrator:= 38949;
+SET @InfiltratorS:= 38967;
+SET @Decrepit:=1547;
+SET @Cursed:=1548;
+SET @Zygand:=1515;
+
+UPDATE `creature_template` SET `unit_flags`=33024 WHERE `entry`=@Infiltrator;
+
+DELETE FROM `creature_text` WHERE `entry`=@Infiltrator;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(@Infiltrator, 0, 0, 'You deserve to lose this land, for what you people did to us! Now back off, or face the wrath of the worgen!', 12, 0, 100, 1, 0, 0, 'Infiltrator', 38896);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Zygand  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Infiltrator  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @InfiltratorS  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Decrepit  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Decrepit*100  AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Cursed  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Cursed*100  AND `source_type` = 9;
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@Infiltrator, @InfiltratorS, @Cursed, @Decrepit, @Zygand);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(@Infiltrator, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Infiltrator - Just summoned - talk'),
+(@Infiltrator, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 7, 24992, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, ' Infiltrator - Just summoned - addquest'),
+(@InfiltratorS, 0, 0, 0, 1, 0, 100, 0, 2000, 2000, 2000, 2000, 11, 73167, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'InfiltratorS - ooc - cast'),
+(@Decrepit, 0, 0, 0, 0, 0, 100, 0, 1000, 1000, 6000, 6000, 11, 82797, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Decrepit - IC - CAST'),
+(@Decrepit, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 4000, 4000, 11, 17253, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Decrepit - IC - CAST'),
+(@Decrepit, 0, 2, 0, 4, 0, 100, 1, 0, 0, 0, 0, 80, @Decrepit*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Decrepit - On aggro - ActionList'),
+(@Decrepit*100, 9, 0, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 85, 73150, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Decrepit - Actionlist - cast'),
+(@Cursed, 0, 0, 0, 0, 0, 100, 0, 1000, 1000, 6000, 6000, 11, 82797, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cursed - IC - CAST'),
+(@Cursed, 0, 1, 0, 0, 0, 100, 0, 3000, 3000, 4000, 4000, 11, 17253, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Cursed - IC - CAST'),
+(@Cursed, 0, 2, 0, 4, 0, 100, 1, 0, 0, 0, 0, 80, @Cursed*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cursed - On aggro - ActionList'),
+(@Cursed*100, 9, 0, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 85, 73150, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Cursed - Actionlist - cast'),
+(@Zygand, 0, 0, 0, 20, 0, 100, 0, 24993, 0, 0, 0, 28, 73162, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Zygand - On Quest rewarded - remove aura');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`IN (3) AND `SourceEntry` IN (@Decrepit, @Cursed);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`, `ErrorTextId`,`ScriptName`,`Comment`,NegativeCondition) VALUES
+(22,3,@Decrepit,0,9,24992,0,0,0,'','event require quest not taken',1),
+(22,3,@Decrepit,0,8,24992,0,0,0,'','event require quest not rewarded',1),
+(22,3,@Decrepit,0,28,24992,0,0,0,'','event require quest not complete',1),
+(22,3,@Cursed,0,9,24992,0,0,0,'','event require quest not taken',1),
+(22,3,@Cursed,0,8,24992,0,0,0,'','event require quest not rewarded',1),
+(22,3,@Cursed,0,28,24992,0,0,0,'','event require quest not complete',1);
+
+SET @CGUID := 358988; -- Guid to change
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+9;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 38967, 0, 1, 1, 2215.87, 297.094, 34.2127, 3.91798, 300, 10, 1),
+(@CGUID+1, 38967, 0, 1, 1, 2212.88, 320.079, 33.6986, 4.93019, 300, 10, 1),
+(@CGUID+2, 38967, 0, 1, 1, 2256.88, 257.801, 33.6125, 4.91283, 300, 10, 1),
+(@CGUID+3, 38967, 0, 1, 1, 2246.67, 267.875, 33.5188, 1.01928, 300, 10, 1),
+(@CGUID+4, 38967, 0, 1, 1, 2234.85, 279.328, 33.5336, 2.6798, 300, 10, 1),
+(@CGUID+5, 38967, 0, 1, 1, 2220.94, 303.420, 33.6573, 4.35522, 300, 10, 1),
+(@CGUID+6, 38967, 0, 1, 1, 2256.60, 260.323, 33.7722, 5.99257, 300, 10, 1),
+(@CGUID+7, 38967, 0, 1, 1, 2242.65, 287.036, 33.6569, 0.227549, 300, 10, 1),
+(@CGUID+8, 38967, 0, 1, 1, 2294.16, 344.134, 34.0563, 2.51015, 300, 10, 1),
+(@CGUID+9, 38967, 0, 1, 1, 2250.24, 255.973, 33.5953, 6.11434, 300, 10, 1);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@InfiltratorS;
+INSERT INTO `creature_template_addon` (`entry`, `bytes1`, `bytes2`, `auras`) VALUES (@InfiltratorS, 196608, 0, "32615 81464");  
+
+DELETE FROM `spell_area` WHERE `spell`=73162 AND `area`=159; 
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `racemask`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(73162, 159, 24993, 0, 0, 1, 8, 0);
diff --git a/sql/updates/world/2015_03_16_08_world.sql b/sql/updates/world/2015_03_16_08_world.sql
new file mode 100644
index 00000000000..854c017745f
--- /dev/null
+++ b/sql/updates/world/2015_03_16_08_world.sql
@@ -0,0 +1,111 @@
+-- 
+SET @Oracle := 1544;
+SET @Puddlejumper := 1543;
+SET @OracleC := 39078;
+SET @PuddlejumperC :=38923;
+SET @Sparky :=39080;
+SET @Speckle :=39079;
+SET @Claston:= 38925;
+
+SET @CGUID := 293940; -- Guid to change
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+1;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, @Sparky, 0, 1, 1, 2224.109375, 1010.946716, 44.425846, 2.491251, 300, 10, 2),
+(@CGUID+1, @Speckle, 0, 1, 1, 2224.109375, 1010.946716, 44.425846, 2.491251, 300, 10, 2);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (@Sparky, @Speckle);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `bytes1`, `bytes2`, `auras`) VALUES
+(@Sparky, @Sparky, 65536, 0, "73440"), -- seen by 73438
+(@Speckle,@Speckle, 65536, 0, "73439"); -- seen by 73437
+
+DELETE FROM `waypoint_data` WHERE `id` in (@Sparky, @Speckle);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@Sparky,1,2224.109375,1010.946716,44.425846,0,0,0,0,100,0),
+(@Sparky,2,2225.722656,1013.930176,44.425846,0,0,0,0,100,0),
+(@Sparky,3,2222.580566,1018.286926,44.425846,0,0,0,0,100,0),
+(@Sparky,4,2220.414551,1020.660034,44.425846,0,15000,0,0,100,0),
+(@Sparky,5,2221.984131,1016.882935,44.425846,0,0,0,0,100,0),
+(@Sparky,6,2220.043701,1015.354858,44.425846,0,0,0,0,100,0),
+(@Sparky,7,2214.370605,1020.559509,40.833614,0,0,0,0,100,0),
+(@Sparky,8,2217.429688,1024.070801,40.833122,0,0,0,0,100,0),
+(@Sparky,9,2223.840088,1017.623657,37.124043,0,0,0,0,100,0),
+(@Sparky,10,2228.423340,1020.253601,37.115318,0,0,0,0,100,0),
+(@Sparky,11,2222.105713,1012.602661,37.122444,0,20000,0,0,100,0),
+(@Sparky,12,2222.545410,1019.843079,37.172771,0,0,0,0,100,0),
+(@Sparky,13,2217.106201,1023.872314,40.835274,0,0,0,0,100,0),
+(@Sparky,14,2214.000244,1020.534363,40.839729,0,0,0,0,100,0),
+(@Sparky,15,2219.348633,1015.932861,44.425934,0,0,0,0,100,0),
+(@Sparky,16,2224.586182,1016.131165,44.425934,0,0,0,0,100,0),
+(@Sparky,17,2225.516846,1012.946350,44.425934,0,0,0,0,100,0),
+(@Sparky,18,2223.854248,1010.827820,44.425934,0,10000,0,0,100,0),
+(@Speckle,1,2224.109375,1010.946716,44.425846,0,0,0,0,100,0),
+(@Speckle,2,2225.722656,1013.930176,44.425846,0,0,0,0,100,0),
+(@Speckle,3,2222.580566,1018.286926,44.425846,0,0,0,0,100,0),
+(@Speckle,4,2220.414551,1020.660034,44.425846,0,10000,0,0,100,0),
+(@Speckle,5,2221.984131,1016.882935,44.425846,0,0,0,0,100,0),
+(@Speckle,6,2220.043701,1015.354858,44.425846,0,0,0,0,100,0),
+(@Speckle,7,2214.370605,1020.559509,40.833614,0,0,0,0,100,0),
+(@Speckle,8,2217.429688,1024.070801,40.833122,0,0,0,0,100,0),
+(@Speckle,9,2223.840088,1017.623657,37.124043,0,0,0,0,100,0),
+(@Speckle,10,2228.423340,1020.253601,37.115318,0,0,0,0,100,0),
+(@Speckle,11,2222.105713,1012.602661,37.122444,0,10000,0,0,100,0),
+(@Speckle,12,2222.545410,1019.843079,37.172771,0,0,0,0,100,0),
+(@Speckle,13,2217.106201,1023.872314,40.835274,0,0,0,0,100,0),
+(@Speckle,14,2214.000244,1020.534363,40.839729,0,0,0,0,100,0),
+(@Speckle,15,2219.348633,1015.932861,44.425934,0,0,0,0,100,0),
+(@Speckle,16,2224.586182,1016.131165,44.425934,0,0,0,0,100,0),
+(@Speckle,17,2225.516846,1012.946350,44.425934,0,0,0,0,100,0),
+(@Speckle,18,2223.854248,1010.827820,44.425934,0,20000,0,0,100,0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Oracle  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Oracle*100  AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Puddlejumper  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @Puddlejumper*100  AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @OracleC  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @OracleC*100  AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @OracleC*100+1  AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @PuddlejumperC  AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @PuddlejumperC*100  AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @PuddlejumperC*100+1  AND `source_type` = 9;
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` in (@Claston, @Oracle, @Puddlejumper, @OracleC, @PuddlejumperC, @Sparky, @Speckle);
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(@Oracle, 0, 0, 0, 8, 0, 100, 0, 73108, 0, 0, 0, 80, @Oracle*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oracle - On SpellHit - Actionlist'),
+(@Oracle*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 85, 73434, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Oracle - Actionlist - castSpellToSummon'),
+(@Oracle*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oracle - Actionlist - Despawn'),
+(@Oracle, 0, 1, 0, 23, 0, 100, 0, 12550, 0, 0, 0, 11, 12550, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Oracle - dont has aura - cast spell'),
+(@Oracle, 0, 2, 0, 0, 0, 100, 0, 1000, 1000, 5000, 5000, 11, 9532, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Oracle - IC - CAST'),
+(@OracleC, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 80, @OracleC*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'OracleC - On Spawn - Actionlist'),
+(@OracleC*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'OracleC - On Script - Set React Passive'),
+(@OracleC*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0,1, 0, 0, 0, 0, 0, 0, 0, 'OracleC - On Script - Set Immune To NPC'),
+(@OracleC*100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, @PuddlejumperC, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'OracleC - Actionlist - Credit quest'),
+(@OracleC*100, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 85, 82922, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'OracleC - On spawn - Cast cosmetic chains'),
+(@Puddlejumper, 0, 0, 0, 8, 0, 100, 0, 73108, 0, 0, 0, 80, @Puddlejumper*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Puddlejumper - On SpellHit - Actionlist'),
+(@Puddlejumper*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 85, 73110, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Puddlejumper - Actionlist - castSpellToSummon'),
+(@Puddlejumper*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Puddlejumper - Actionlist - Despawn'),
+(@Puddlejumper, 0, 1, 0, 0, 0, 100, 0, 1000, 1000, 5000, 5000, 11, 75002, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Puddlejumper - IC - CAST'),
+(@PuddlejumperC, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 80, @PuddlejumperC*100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - On Spawn - Actionlist'),
+(@PuddlejumperC*100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - On Script - Set React Passive'),
+(@PuddlejumperC*100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0,1, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - On Script - Set Immune To NPC'),
+(@PuddlejumperC*100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, @PuddlejumperC, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - Actionlist - Credit quest'),
+(@PuddlejumperC*100, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 85, 82922, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - On spawn - Cast cosmetic chains'),
+(@OracleC, 0, 1, 0, 75, 0, 100, 1, 0, @Claston, 2, 0, 80, @OracleC*100+1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'OracleC - On Spawn - Actionlist'),
+(@OracleC*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 38887, 0, 0, 0, 0, 0, 21, 10, 0, 0, 0, 0, 0, 0, 'OracleC - Actionlist - Credit quest'),
+(@OracleC*100+1, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'OracleC - Actionlist - Credit quest'),
+(@PuddlejumperC, 0, 1, 0, 75, 0, 100, 1, 0, @Claston, 2, 0, 80, @PuddlejumperC*100+1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - On Spawn - Actionlist'),
+(@PuddlejumperC*100+1, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 33, 38887, 0, 0, 0, 0, 0, 21, 10, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - Actionlist - Credit quest'),
+(@PuddlejumperC*100+1, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'PuddlejumperC - Actionlist - Credit quest');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=73108;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,73108,0,0,38,1,30,2,0,0,0,0,'','the spell can be cast only at 30% of hp.'),
+(17,0,73108,0,1,38,1,30,2,0,0,0,0,'','the spell can be cast only at 30% of hp.'),
+(17,0,73108,0,0,31,1,3,@Oracle,0,0,0,0,'','Only Oracle are affected by the spell.'),
+(17,0,73108,0,1,31,1,3,@Puddlejumper,0,0,0,0,'','Only Puddlejumper are affected by the spell.');
+
+DELETE FROM `spell_area` WHERE `spell`=73438 AND `area`=159;
+DELETE FROM `spell_area` WHERE `spell`=73437 AND `area`=159;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `racemask`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(73438, 159, 24974 , 0, 0, 1, 64, 0),
+(73437, 159, 24974 , 0, 0, 1, 64, 0);
diff --git a/sql/updates/world/2015_03_16_09_world.sql b/sql/updates/world/2015_03_16_09_world.sql
new file mode 100644
index 00000000000..4487e9efa4c
--- /dev/null
+++ b/sql/updates/world/2015_03_16_09_world.sql
@@ -0,0 +1,53 @@
+-- A slimy Situation
+-- Kelnir Leafsong SAI
+SET @ENTRY := 47696;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,20,0,100,0,28207,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kelnir Leafsong - On Quest 'A Slimy Situation' Finished - Say Line 0"),
+(@ENTRY,0,1,0,61,0,100,0,28207,0,0,0,45,1,1,0,0,0,0,10,361152,47692,0,0,0,0,0,"Kelnir Leafsong - On Quest 'A Slimy Situation' Finished - Set Data 1 1");
+
+DELETE FROM `creature_addon` WHERE `guid`=361152;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(361152,0,0,8,1,0, '');
+
+-- Altsoba Ragetotem SAI
+SET @ENTRY := 47692;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Altsoba Ragetotem - On Data Set 1 1 - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 4769200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,5000,5000,0,0,5,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Altsoba Ragetotem - On Script - Play Emote 7"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Altsoba Ragetotem - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Altsoba Ragetotem - On Script - Say Line 1"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,11,89282,0,0,0,0,0,1,0,0,0,0,0,0,0,"Altsoba Ragetotem - On Script - Cast 'Vomit Slime'");
+
+-- Purged Bloodvenom SAI
+SET @ENTRY := 48019;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Purged Bloodvenom - On Just Summoned - Run Script"),
+(@ENTRY,0,1,0,40,0,100,0,2,48019,0,0,41,2000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Purged Bloodvenom - On Waypoint 2 Reached - Despawn In 2000 ms");
+
+-- Actionlist SAI
+SET @ENTRY := 4801900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,53,1,48019,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Start Waypoint");
+
+DELETE FROM `waypoints` WHERE `entry`=48019;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(48019, 1, 5181.72, -705.112, 335.698, 'Purged Bloodvenom'),
+(48019, 2, 5166.87, -680.257, 331.131, 'Purged Bloodvenom');
+
+DELETE FROM `creature_text` WHERE `entry` IN (47696, 47692);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(47696, 0, 0, 'Open wide, Mr. Tauren! Here comes the hippogryph into the roost!', 12, 0, 100, 0, 0, 0, 48256, 0, 'Kelnir Leafsong'),
+(47692, 0, 0, 'Urrrrrrgh...', 12, 0, 100, 0, 0, 0, 48254, 0, 'Altsoba Ragetotem'),
+(47692, 1, 0, 'HLORRHGH!', 14, 0, 100, 0, 0, 0, 48255, 0, 'Altsoba Ragetotem');
diff --git a/sql/updates/world/2015_03_16_10_world.sql b/sql/updates/world/2015_03_16_10_world.sql
new file mode 100644
index 00000000000..1dce6c40205
--- /dev/null
+++ b/sql/updates/world/2015_03_16_10_world.sql
@@ -0,0 +1,63 @@
+-- 
+-- Navarax's Gambit
+DELETE FROM `creature_text` WHERE `entry` IN (47842, 48487);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextID`, `comment`) VALUES
+(47842, 0, 0, 'Your death will tell a different story!', 14, 0, 100, 0, 0, 0, 48370, 'Arch Druid Navarax to Player'),
+(48487, 0, 0, 'What is going on in here?!', 12, 0, 100, 5, 0, 0, 48691, 'Whisperwind Druid to Player'),
+(48487, 1, 0, 'The Arch Druid... how in the world...?', 12, 0, 100, 274, 0, 0, 48692, 'Whisperwind Druid to Player'),
+(48487, 2, 0, 'I... I must tell the others. You should find Huntress Selura right away.', 12, 0, 100, 1, 0, 0, 48693, 'Whisperwind Druid to Player');
+
+DELETE FROM `gossip_menu` WHERE (`entry`=12353 AND `text_id`=17477);
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
+(12353, 17477); -- 47923
+
+-- DELETE FROM `broadcast_text` WHERE `ID`=48373;
+-- INSERT INTO `broadcast_text` (`ID`, `Language`, `MaleText`, `FemaleText`, `EmoteID0`, `EmoteID1`, `EmoteID2`, `EmoteDelay0`, `EmoteDelay1`, `EmoteDelay2`, `SoundId`, `Unk1`, `Unk2`, `VerifiedBuild`) VALUES
+-- (48373, 0, 'Yes, my child?', '', 0, 0, 0, 0, 0, 0, 0, 0, 1, 19342); -- 48373
+
+DELETE FROM `gossip_menu_option` WHERE (`menu_id`=12398 AND `id`=0);
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
+(12398, 0, 0, 'You''re accused of being a demon in disguise, Navarax... if that''s even your real name!', 1, 1, 0, 0, 0, 0, '', 0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=12398 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 12398, 0, 0, 0, 9, 0, 28264, 0, 0, 0, 0, 0, '', 'Gossip Option requires quest not complete');
+
+-- Arch Druid Navarax SAI
+SET @ENTRY := 47842;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,12398,0,0,0,2,14,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Navarax - On Gossip Option 0 Selected - Set Faction 14"),
+(@ENTRY,0,1,4,61,0,100,0,12398,0,0,0,49,0,0,0,0,0,0,21,20,0,0,0,0,0,0,"Arch Druid Navarax - On Gossip Option 0 Selected - Start Attacking"),
+(@ENTRY,0,2,0,25,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Navarax - On Reset - Set Faction 35"),
+(@ENTRY,0,3,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Navarax - On Aggro - Say Line 0"),
+(@ENTRY,0,4,7,61,0,100,0,12398,0,0,0,11,89515,2,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Navarax - On Gossip Option 0 Selected - Cast 'Xaravan's Transformation'"),
+(@ENTRY,0,5,0,0,0,100,0,1000,1000,5000,5000,11,36996,0,0,0,0,0,2,0,0,0,0,0,0,0,"Arch Druid Navarax - In Combat - Cast 'Claw Swipe'"),
+(@ENTRY,0,6,0,6,0,100,0,0,0,0,0,12,48487,6,0,0,0,0,8,0,0,0,6050.23,-934.345,455.853,1.15377,"Arch Druid Navarax - On Just Died - Summon Creature 'Whisperwind Druid'"),
+(@ENTRY,0,7,0,61,0,100,0,12398,0,0,0,3,48160,0,0,0,0,0,0,0,0,0,0,0,0,0,"Arch Druid Navarax - On Gossip Option 0 Selected - Morph To Model 10189"),
+(@ENTRY,0,8,0,0,0,100,1,1000,1000,0,0,3,48160,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arch Druid Navarax - In Combat - Morph To Creature Xaravan");
+
+-- Whisperwind Druid SAI
+SET @ENTRY := 48487;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,53,1,48487,0,0,0,0,1,0,0,0,0,0,0,0,"Whisperwind Druid - On Just Summoned - Start Waypoint"),
+(@ENTRY,0,1,2,40,0,100,0,1,48487,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Whisperwind Druid - On Waypoint 1 Reached - Run Script"),
+(@ENTRY,0,2,0,61,0,100,0,1,48487,0,0,54,12000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Whisperwind Druid - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,40,0,100,0,3,48487,0,0,41,2000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Whisperwind Druid - On Waypoint 3 Reached - Despawn In 2000 ms");
+
+-- Actionlist SAI
+SET @ENTRY := 4848700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 2");
+
+DELETE FROM `waypoints` WHERE `entry`=48487;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES 
+(48487, 1, 6053.084473, -927.829712, 455.742828, 'Whisperwind Druid'),
+(48487, 2, 6050.680664, -933.536255, 455.892639, 'Whisperwind Druid'),
+(48487, 3, 6054.942383, -934.681335, 455.893829, 'Whisperwind Druid');
diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp
index 61c6c906dcf..6a60b79d094 100644
--- a/src/server/game/Server/Protocol/Opcodes.cpp
+++ b/src/server/game/Server/Protocol/Opcodes.cpp
@@ -186,7 +186,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_AUTOSTORE_BANK_ITEM,                     STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoStoreBankItemOpcode   );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_AUTOSTORE_GROUND_ITEM,                   STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_AUTOSTORE_LOOT_ITEM,                                STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Loot::AutoStoreLootItem, &WorldSession::HandleAutostoreLootItemOpcode);
-    DEFINE_HANDLER(CMSG_BANKER_ACTIVATE,                                    STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::NPC::Hello, &WorldSession::HandleBankerActivateOpcode);
+    DEFINE_HANDLER(CMSG_BANKER_ACTIVATE,                                    STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::NPC::Hello, &WorldSession::HandleBankerActivateOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_JOIN,                        STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_LEAVE,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::HandleBattlefieldLeaveOpcode    );
     DEFINE_OPCODE_HANDLER_OLD(CMSG_BATTLEFIELD_LIST,                        STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlefieldListOpcode     );
@@ -664,7 +664,7 @@ void OpcodeTable::Initialize()
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUESTGIVER_CANCEL,                       STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_QUESTGIVER_CHOOSE_REWARD,                           STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverChooseReward, &WorldSession::HandleQuestgiverChooseRewardOpcode);
     DEFINE_HANDLER(CMSG_QUESTGIVER_COMPLETE_QUEST,                          STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverCompleteQuest, &WorldSession::HandleQuestgiverCompleteQuest);
-    DEFINE_HANDLER(CMSG_QUESTGIVER_HELLO,                                   STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverHello, &WorldSession::HandleQuestgiverHelloOpcode);
+    DEFINE_HANDLER(CMSG_QUESTGIVER_HELLO,                                   STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverHello, &WorldSession::HandleQuestgiverHelloOpcode);
     DEFINE_HANDLER(CMSG_QUESTGIVER_QUERY_QUEST,                             STATUS_LOGGEDIN,  PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverQueryQuest, &WorldSession::HandleQuestgiverQueryQuestOpcode);
     DEFINE_OPCODE_HANDLER_OLD(CMSG_QUESTGIVER_QUEST_AUTOLAUNCH,             STATUS_UNHANDLED, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     DEFINE_HANDLER(CMSG_QUESTGIVER_REQUEST_REWARD,                          STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Quest::QuestGiverRequestReward, &WorldSession::HandleQuestgiverRequestRewardOpcode);
@@ -1754,7 +1754,7 @@ void OpcodeTable::Initialize()
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_TIME_ZONE_INFORMATION,               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_VEHICLE_REC_ID,                      STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_VIGNETTE,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
-    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_BANK,                               STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
+    DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_BANK,                               STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_MAILBOX,                            STATUS_NEVER,        CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_NEUTRAL_PLAYER_FACTION_SELECT_UI,   STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
     DEFINE_SERVER_OPCODE_HANDLER(SMSG_SHOW_RATINGS,                            STATUS_UNHANDLED,    CONNECTION_TYPE_REALM);
diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h
index da7adf5d748..961ba613bd8 100644
--- a/src/server/game/Server/Protocol/Opcodes.h
+++ b/src/server/game/Server/Protocol/Opcodes.h
@@ -574,7 +574,7 @@ enum OpcodeClient : uint32
     CMSG_QUESTGIVER_CANCEL                            = 0xBADD,
     CMSG_QUESTGIVER_CHOOSE_REWARD                     = 0x0CE1,
     CMSG_QUESTGIVER_COMPLETE_QUEST                    = 0x0A69,
-    CMSG_QUESTGIVER_HELLO                             = 0xBADD,
+    CMSG_QUESTGIVER_HELLO                             = 0x0B2A,
     CMSG_QUESTGIVER_QUERY_QUEST                       = 0x131A,
     CMSG_QUESTGIVER_QUEST_AUTOLAUNCH                  = 0xBADD,
     CMSG_QUESTGIVER_REQUEST_REWARD                    = 0xBADD,
@@ -725,7 +725,7 @@ enum OpcodeClient : uint32
     CMSG_TAXIENABLEALLNODES                           = 0xBADD,
     CMSG_TAXISHOWNODES                                = 0xBADD,
     CMSG_TAXI_NODE_STATUS_QUERY                       = 0x0EA1,
-    CMSG_TAXI_QUERY_AVAILABLE_NODES                   = 0x0B2A,
+    CMSG_TAXI_QUERY_AVAILABLE_NODES                   = 0xBADD,
     CMSG_TELEPORT_TO_UNIT                             = 0xBADD,
     CMSG_TEXT_EMOTE                                   = 0x0B2B,
     CMSG_TIME_ADJUSTMENT_RESPONSE                     = 0xBADD,