Merge branch 'master' into 4.3.4

9 files changed, 171 insertions, 14 deletions

diff --git a/sql/updates/world/2014_07_15_00_world_misc.sql b/sql/updates/world/2014_07_15_00_world_misc.sql
new file mode 100644
index 00000000000..a2f7e0278f1
--- /dev/null
+++ b/sql/updates/world/2014_07_15_00_world_misc.sql
@@ -0,0 +1,45 @@
+SET @CGuid := 76311; -- Needs 3 for the 3 permament spawns of living poison which never activate or move but are used to spawn the 
+
+-- Living poison sets immune to pc on spawn and moves forward, if any player comes within 1 yard range it will then remove immune to pc flags
+-- and cast explosion spell, it must allow pc at this point otherwise the spell only kills the living poison
+-- must set immune to pc on spawn as otherwise instead of moving in straight line will agro and move to players which is wrong behavior
+
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`speed_run`=1.428571 WHERE `entry`=16027;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16027 AND `source_type`=0;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=16027;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(16027, 0, 0x0, 0x1, '18950'); -- 16027 - 18950
+
+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 
+(16027, 0, 0, 1, 10, 1, 100, 1, 0, 1, 0, 0, 19, 256, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - OOC LOS - Remove Unit Flags Immune to PC (Phase 1)'),
+(16027, 0, 1, 0, 61, 1, 100, 1, 0, 0, 0, 0, 11, 28433, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - OOC LOS - Cast Explode (Phase 1)'),
+(16027, 0, 2, 3, 54, 0, 100, 1, 0, 0, 0, 0, 18, 256, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Just Summoned - Set Unit Flags Immune to PC'),
+(16027, 0, 3, 4, 61, 0, 100, 1, 0, 0, 0, 0, 46, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Just Summoned - Move Forward'),
+(16027, 0, 4, 0, 61, 0, 100, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Just Summoned - Set Phase 1');
+
+-- We will use 3 living poison (from sniff) with sai per guid to spawn the moving living poison
+-- the living poison spawned by these have sai on creature template but only executes sai on just summoned (event 54)
+-- the 3 instances of the npc spawned for this purpose only the ones summoned by the sai on these run the script to move
+-- and cast the explosion spell on self if player gets in range resulting in both the living poison and any players in range dying
+
+-- Creature Data taken from 15354_2012-03-16_10-04-38_raids.pkt
+
+DELETE FROM `creature` WHERE `guid` IN (@CGuid, @CGuid+1, @CGuid+2) AND `id`=16027;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID,   16027, 533, 3, 1, 3128.499, -3131.24,  294.0653, 4.725505, 7200, 0, 0),
+(@CGUID+1, 16027, 533, 3, 1, 3151.244, -3137.117, 294.0628, 4.456693, 7200, 0, 0),
+(@CGUID+2, 16027, 533, 3, 1, 3169.886, -3145.452, 294.0555, 4.244928, 7200, 0, 0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(-@CGuid,-@CGuid-1,-@CGuid-2) 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 
+(-@CGuid, 0, 0, 0, 1, 0, 100, 0, 0, 0, 3333, 3333, 12, 16027, 1, 8000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - OOC - Spawn Living Poison'),
+(-@CGuid-1, 0, 0, 0, 1, 0, 100, 0, 0, 0, 3333, 3333, 12, 16027, 1, 8000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - OOC - Spawn Living Poison'),
+(-@CGuid-2, 0, 0, 0, 1, 0, 100, 0, 0, 0, 3333, 3333, 12, 16027, 1, 8000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - OOC - Spawn Living Poison'),
+(-@CGuid, 0, 1, 2, 11, 0, 100, 0, 0, 0, 0, 0, 18, 256, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Spawn - Set Unit Flags Immune to PC'),
+(-@CGuid-1, 0, 1, 2, 11, 0, 100, 0, 0, 0, 0, 0, 18, 256, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Spawn - Set Unit Flags Immune to PC'),
+(-@CGuid-2, 0, 1, 2, 11, 0, 100, 0, 0, 0, 0, 0, 18, 256, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Spawn - Set Unit Flags Immune to PC'),
+(-@CGuid, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Spawn - Set Invisible'),
+(-@CGuid-1, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Spawn - Set Invisible'),
+(-@CGuid-2, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Living Poison - On Spawn - Set Invisible');
diff --git a/sql/updates/world/2014_07_15_01_world_misc.sql b/sql/updates/world/2014_07_15_01_world_misc.sql
new file mode 100644
index 00000000000..05e546a33ab
--- /dev/null
+++ b/sql/updates/world/2014_07_15_01_world_misc.sql
@@ -0,0 +1,65 @@
+--
+SET @STINKER := 23274;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@STINKER;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@STINKER 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
+(@STINKER, 0, 1, 8,75, 0, 100, 0, 0, 7383, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 7383, 0, 0, 0, 0, 0, 0, 'Stinker - On Black Tabby Cat within 20yrds - Store Targetlist'),
+(@STINKER, 0, 2, 8,75, 0, 100, 0, 0, 7385, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 7385, 0, 0, 0, 0, 0, 0, 'Stinker - On Bombay Cat within 20yrds - Store Targetlist'),
+(@STINKER, 0, 3, 8,75, 0, 100, 0, 0, 22816, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 22816, 0, 0, 0, 0, 0, 0, 'Stinker - On Black Cat within 20yrds - Store Targetlist'),
+(@STINKER, 0, 4, 8,75, 0, 100, 0, 0, 7384, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 7384, 0, 0, 0, 0, 0, 0, 'Stinker - On Cornish Rex Cat within 20yrds - Store Targetlist'),
+(@STINKER, 0, 5, 8,75, 0, 100, 0, 0, 7382, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 7382, 0, 0, 0, 0, 0, 0, 'Stinker - On Orange Tabby within 20yrds - Store Targetlist'),
+(@STINKER, 0, 6, 8,75, 0, 100, 0, 0, 7380, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 7380, 0, 0, 0, 0, 0, 0, 'Stinker - On Siamese Cat within 20yrds - Store Targetlist'),
+(@STINKER, 0, 7, 8,75, 0, 100, 0, 0, 7381, 20, 90000, 64, 1, 0, 0, 0, 0, 0, 19, 7381, 0, 0, 0, 0, 0, 0, 'Stinker - On Silver Tabby Cat within 20yrds - Store Targetlist'),
+(@STINKER, 0, 8, 9,61, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event - Cast Stinker In Love - Set Phase 1'),
+(@STINKER, 0, 9, 10,61, 0, 100, 0, 0, 0, 0, 0, 11, 62002, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event - Cast Stinker In Love'),
+(@STINKER, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 62001, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event - Cast Stinker Passive'),
+(@STINKER, 0, 11, 12,1, 1, 100, 0, 0, 0, 2000, 5000, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - OOC (Phase 1) - Set Run'),
+(@STINKER, 0, 12, 13,61, 1, 100, 0, 0, 0, 0, 0, 11, 62002, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event (Phase 1) - Cast Stinker In Love'),
+(@STINKER, 0, 13, 0,61, 1, 100, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event (Phase 1) - Follow Stored Target'),
+(@STINKER, 0, 14, 0,1, 1, 100, 0, 30000, 45000, 30000, 45000, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - OOC (Phase 1) - Set Phase 2'),
+(@STINKER, 0, 15, 16,23, 1, 100, 0, 62002, 0, 0, 0, 11, 62004, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - On Has No Aura (Stinker in love) (Phase 1) - Cast Stinker Heartbroken'),
+(@STINKER, 0, 16, 17,61, 1, 100, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event (Phase 1) - Set Phase 0'),
+(@STINKER, 0, 17, 21,61, 0, 100, 0, 0, 0, 0, 0, 28, 62001, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event  - Remove aura stinker passive'),
+(@STINKER, 0, 18, 19,23, 2, 100, 0, 62002, 0, 0, 0, 11, 62004, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - On Has No Aura (Stinker in love) (Phase 2) - Cast Stinker Heartbroken'),
+(@STINKER, 0, 19, 20,61, 2, 100, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event (Phase 2) - Set Phase 0'),
+(@STINKER, 0, 20, 21,61, 0, 100, 0, 0, 0, 0, 0, 28, 62001, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event  - Remove aura stinker passive'),
+(@STINKER, 0, 21, 22,61, 0, 100, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event  - Follow'),
+(@STINKER, 0, 22, 0,61, 0, 100, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Stinker - Linked with Previous Event  - Follow');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`IN(62000,62002,62004);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 62000, 0, 0, 31, 0, 3, 7383, 0, 0, 0, 0, '', 'Stinker Periodic Hits Black Tabby Cat'),
+(13, 1, 62000, 0, 1, 31, 0, 3, 7385, 0, 0, 0, 0, '', 'Stinker Periodic Hits Bombay Cat'),
+(13, 1, 62000, 0, 2, 31, 0, 3, 22816, 0, 0, 0, 0, '', 'Stinker Periodic Hits Black Cat'),
+(13, 1, 62000, 0, 3, 31, 0, 3, 7384, 0, 0, 0, 0, '', 'Stinker Periodic Hits Cornish Rex Cat'),
+(13, 1, 62000, 0, 4, 31, 0, 3, 7382, 0, 0, 0, 0, '', 'Stinker Periodic Hits Orange Tabby Cat'),
+(13, 1, 62000, 0, 5, 31, 0, 3, 7380, 0, 0, 0, 0, '', 'Stinker Periodic Hits Siamese Cat'),
+(13, 1, 62000, 0, 6, 31, 0, 3, 7381, 0, 0, 0, 0, '', 'Stinker Periodic Hits Silver Tabby'),
+(13, 1, 62002, 0, 0, 31, 0, 3, 7383, 0, 0, 0, 0, '', 'Stinker In Love Hits Black Tabby Cat'),
+(13, 1, 62002, 0, 1, 31, 0, 3, 7385, 0, 0, 0, 0, '', 'Stinker In Love Hits Bombay Cat'),
+(13, 1, 62002, 0, 2, 31, 0, 3, 22816, 0, 0, 0, 0, '', 'Stinker In Love Hits Black Cat'),
+(13, 1, 62002, 0, 3, 31, 0, 3, 7384, 0, 0, 0, 0, '', 'Stinker In Love Hits Cornish Rex Cat'),
+(13, 1, 62002, 0, 4, 31, 0, 3, 7382, 0, 0, 0, 0, '', 'Stinker In Love Hits Orange Tabby Cat'),
+(13, 1, 62002, 0, 5, 31, 0, 3, 7380, 0, 0, 0, 0, '', 'Stinker In Love Hits Siamese Cat'),
+(13, 1, 62002, 0, 6, 31, 0, 3, 7381, 0, 0, 0, 0, '', 'Stinker In Love Hits Silver Tabby Cat'),
+(13, 1, 62002, 0, 7, 31, 0, 3, @STINKER, 0, 0, 0, 0, '', 'Stinker In Love Hits Stinker'),
+(13, 1, 62004, 0, 8, 31, 0, 3, @STINKER, 0, 0, 0, 0, '', 'Stinker Heartbroken Hits Stinker');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`IN(7383,7385,22816,7384,10338,7382,7380,10337,7381);
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN (7383,7385,22816,7384,10338,7382,7380,10337,7381) 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
+(7383, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Black Tabby Cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(7383, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Black Tabby Cat - On Has No Aura (Stinker in love) - Evade'),
+(7385, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Bombay Cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(7385, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Bombay Cat - On Has No Aura (Stinker in love) - Evade'),
+(22816, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Black Cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(22816, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Black Cat - On Has No Aura (Stinker in love) - Evade'),
+(7384, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cornish Rex Cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(7384, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Cornish Rex Cat - On Has No Aura (Stinker in love) - Evade'),
+(7382, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Orange Tabby Cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(7382, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Orange Tabby Cat - On Has No Aura (Stinker in love) - Evade'),
+(7380, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Siamese Cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(7380, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Siamese Cat - On Has No Aura (Stinker in love) - Evade'),
+(7381, 0, 0, 0,23, 0, 100, 0, 62002, 1, 10000, 0, 11, 62000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Silver Tabby cat - On Has Aura (Stinker in love) - Cast Stinker Periodic'),
+(7381, 0, 1, 0,23, 0, 100, 0, 62002, 0, 10000, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Silver Tabby Cat - On Has No Aura (Stinker in love) - Evade');
diff --git a/sql/updates/world/2014_07_15_02_world_misc.sql b/sql/updates/world/2014_07_15_02_world_misc.sql
new file mode 100644
index 00000000000..d176d28e7ad
--- /dev/null
+++ b/sql/updates/world/2014_07_15_02_world_misc.sql
@@ -0,0 +1,4 @@
+--
+UPDATE `smart_scripts` SET `event_param4`=10000 WHERE  `entryorguid` IN (7380,7381,7382,7383,7384,7385,22816) AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_param3`=4500 WHERE  `entryorguid`=32255 AND `source_type`=0 AND `id`=1 AND `link`=0;
+DELETE FROM `conditions`WHERE `SourceEntry` = '62004';
diff --git a/sql/updates/world/2014_07_16_00_world_misc.sql b/sql/updates/world/2014_07_16_00_world_misc.sql
new file mode 100644
index 00000000000..4fe76dff40b
--- /dev/null
+++ b/sql/updates/world/2014_07_16_00_world_misc.sql
@@ -0,0 +1,8 @@
+UPDATE `creature_template` SET AIName='SmartAI' WHERE `entry`=3287;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=3287 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 
+(3287, 0, 0, 1, 20, 0, 100, 0, 790, 0, 0, 0, 91, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Quest reward Sarkoth  - Set Bytes 1'),
+(3287, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Quest reward Sarkoth  - Set Phase 1'),
+(3287, 0, 2, 3, 1, 1, 100, 0, 3000, 3000, 3000, 3000, 90, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - OOC (Phase 1)  - Set Bytes 1'),
+(3287, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - OOC (Phase 1)  - Set Phase 0');
diff --git a/sql/updates/world/2014_07_16_01_world_misc.sql b/sql/updates/world/2014_07_16_01_world_misc.sql
new file mode 100644
index 00000000000..0c082f37962
--- /dev/null
+++ b/sql/updates/world/2014_07_16_01_world_misc.sql
@@ -0,0 +1,13 @@
+--
+DELETE FROM `creature_template_addon` WHERE `entry`=23322;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(23322, 0, 0, 0, 4097, 0, '40849 40857');
+
+UPDATE `creature_template` SET `AIName`='' WHERE  `entry`=23322;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23322;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN(40825,40830);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 40825, 0, 0, 31, 0, 4, 0, 0, 1, 0, 0, '', 'Banishment Does not hit Player'),
+(13, 1, 40830, 0, 0, 31, 0, 4, 0, 0, 1, 0, 0, '', 'Banishment Does not hit Player');
diff --git a/sql/updates/world/2014_07_16_02_world_misc.sql b/sql/updates/world/2014_07_16_02_world_misc.sql
new file mode 100644
index 00000000000..ecef34a3964
--- /dev/null
+++ b/sql/updates/world/2014_07_16_02_world_misc.sql
@@ -0,0 +1,14 @@
+-- gossip npc text 15321 - all before wrathgate event
+DELETE FROM `gossip_menu` WHERE `entry`=10769 AND `text_id` IN(14931,14933);
+
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES 
+(10769, 14931), -- After Wrathgate event except undead
+(10769, 14933); -- After Wrathgate event undead
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=10769;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(14, 10769, 15321, 0, 0, 8, 0, 12500, 0, 0, 1, 0, 0, '', 'Gossip text requires Return to Angrathar not completed'),
+(14, 10769, 14931, 0, 0, 8, 0, 12500, 0, 0, 0, 0, 0, '', 'Gossip text requires Return to Angrathar completed'),
+(14, 10769, 14931, 0, 0, 16, 0, 16, 0, 0, 1, 0, 0, '', 'Gossip text requires not undead player'),
+(14, 10769, 14933, 0, 0, 8, 0, 12500, 0, 0, 0, 0, 0, '', 'Gossip text requires Return to Angrathar completed'),
+(14, 10769, 14933, 0, 0, 16, 0, 16, 0, 0, 0, 0, 0, '', 'Gossip text requires undead player');
diff --git a/sql/updates/world/2014_07_16_03_world_misc.sql b/sql/updates/world/2014_07_16_03_world_misc.sql
new file mode 100644
index 00000000000..2fb53821427
--- /dev/null
+++ b/sql/updates/world/2014_07_16_03_world_misc.sql
@@ -0,0 +1,18 @@
+--
+UPDATE `creature_template` SET AIName='SmartAI' WHERE `entry`=3287;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=3287 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 
+(3287, 0, 0, 1, 20, 0, 100, 0, 790, 0, 0, 0, 91, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Quest reward Sarkoth  - Set Bytes 1'),
+(3287, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Quest reward Sarkoth  - Store Targetlist'),
+(3287, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Quest reward Sarkoth  - Face Player'),
+(3287, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Quest reward Sarkoth  - Set Phase 1'),
+(3287, 0, 4, 5, 1, 1, 100, 0, 1000, 1000, 1000, 1000, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - OOC (Phase 1)  - Set Bytes 1'),
+(3287, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 60000, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 'Hana zua - OOC (Phase 1)  - Set Say Line 0'),
+(3287, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - OOC (Phase 1)  - Set Phase 0'),
+(3287, 0, 7, 8, 52, 0, 100, 0, 0, 3287, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Text Over Line 0  - Set Bytes 1'),
+(3287, 0, 8, 0, 61, 0, 100, 0, 0, 0, 0, 0, 90, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hana zua - On Text Over Line 0  - Set Bytes 1');
+
+DELETE FROM `creature_text` WHERE `entry`=3287;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES 
+(3287, 0, 0, 'Go swiftly, $n. My fate is in your hands.', 12, 1, 100, 0, 0, 0, 'Hana zua', 1341);
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 73dc69ecffa..f03f1474517 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -595,7 +595,7 @@ inline void Battleground::_ProcessLeave(uint32 diff)
     }
 }
 
-inline Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char const* context) const
+Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char const* context) const
 {
     Player* player = NULL;
     if (!offlineRemove)
@@ -608,17 +608,7 @@ inline Player* Battleground::_GetPlayer(uint64 guid, bool offlineRemove, char co
     return player;
 }
 
-inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::iterator itr, char const* context)
-{
-    return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context);
-}
-
-inline Player* Battleground::_GetPlayer(BattlegroundPlayerMap::const_iterator itr, char const* context) const
-{
-    return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context);
-}
-
-inline Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, char const* context) const
+Player* Battleground::_GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, char const* context) const
 {
     Player* player = _GetPlayer(itr, context);
     if (player)
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index 214a9cd7645..a67be38be05 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -481,8 +481,8 @@ class Battleground
         void PlayerAddedToBGCheckIfBGIsRunning(Player* player);
 
         Player* _GetPlayer(uint64 guid, bool offlineRemove, const char* context) const;
-        Player* _GetPlayer(BattlegroundPlayerMap::iterator itr, const char* context);
-        Player* _GetPlayer(BattlegroundPlayerMap::const_iterator itr, const char* context) const;
+        Player* _GetPlayer(BattlegroundPlayerMap::iterator itr, const char* context) { return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); }
+        Player* _GetPlayer(BattlegroundPlayerMap::const_iterator itr, const char* context) const { return _GetPlayer(itr->first, itr->second.OfflineRemoveTime, context); }
         Player* _GetPlayerForTeam(uint32 teamId, BattlegroundPlayerMap::const_iterator itr, const char* context) const;
 
         void _ProcessOfflineQueue();