aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2014_09_14_03_world_toc5.sql304
-rw-r--r--sql/updates/world/2014_09_14_04_world_toc5.sql32
-rw-r--r--sql/updates/world/2014_09_15_00_world_misc.sql85
-rw-r--r--sql/updates/world/2014_09_15_01_world_gameobject_template.sql2
-rw-r--r--sql/updates/world/2014_09_15_02_world_misc.sql11
-rw-r--r--sql/updates/world/2014_09_15_03_world_misc.sql11
-rw-r--r--sql/updates/world/2014_09_15_04_world_misc.sql36
-rw-r--r--sql/updates/world/2014_09_16_00_world_achievement_criteria_data.sql3
-rw-r--r--sql/updates/world/2014_09_16_01_world_misc.sql33
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp16
-rw-r--r--src/server/game/Server/Protocol/PacketLog.cpp3
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp2
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp7
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp1
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp3
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp2
-rw-r--r--src/server/scripts/Spells/spell_quest.cpp4
-rw-r--r--src/server/shared/Networking/Socket.h2
-rw-r--r--src/server/shared/Networking/SocketMgr.h2
21 files changed, 545 insertions, 20 deletions
diff --git a/sql/updates/world/2014_09_14_03_world_toc5.sql b/sql/updates/world/2014_09_14_03_world_toc5.sql
new file mode 100644
index 00000000000..3b2464e7f5f
--- /dev/null
+++ b/sql/updates/world/2014_09_14_03_world_toc5.sql
@@ -0,0 +1,304 @@
+SET @CGUID := 143275;
+SET @OGUID := 77245;
+
+DELETE FROM `creature` WHERE `map`=650;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+ 0, 35644, 650, 3, 1, 702.967, 587.6493, 412.4754, 0.6108652, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 1, 35644, 650, 3, 1, 774.8976, 573.7361, 412.4752, 2.146755, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 2, 35644, 650, 3, 1, 787.4393, 584.9688, 412.4759, 2.478368, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 3, 35644, 650, 3, 1, 712.5938, 576.2604, 412.4758, 0.8901179, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 4, 35644, 650, 3, 1, 720.5695, 571.2847, 412.4749, 1.064651, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 5, 36558, 650, 3, 1, 790.1771, 589.059, 412.4753, 2.565634, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 6, 36558, 650, 3, 1, 716.6649, 573.4948, 412.4753, 0.9773844, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 7, 36558, 650, 3, 1, 770.4861, 571.5521, 412.4746, 2.059489, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 8, 36558, 650, 3, 1, 700.5313, 591.9271, 412.4749, 0.5235988, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 9, 36558, 650, 3, 1, 778.7413, 576.0486, 412.4756, 2.234021, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 10, 36558, 650, 3, 1, 705.4965, 583.9445, 412.4759, 0.6981317, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 11, 35644, 650, 3, 1, 699.9427, 643.3698, 412.4744, 5.77704, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 12, 35644, 650, 3, 1, 790.4896, 646.533, 412.4745, 3.717551, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 13, 35644, 650, 3, 1, 777.5643, 660.3004, 412.4669, 4.34587, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 14, 35644, 650, 3, 1, 704.9427, 651.3299, 412.4751, 5.602507, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 15, 35644, 650, 3, 1, 793.0087, 592.6667, 412.4749, 2.6529, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 16, 35644, 650, 3, 1, 768.2552, 661.6059, 412.4703, 4.555309, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 17, 35644, 650, 3, 1, 722.3629, 660.7448, 412.4681, 4.834562, 7200, 0, 0), -- Argent Warhorse (Area: Trial of the Champion) (Auras: 67870 - Trample)
+(@CGUID+ 18, 35016, 650, 3, 1, 748.8837, 616.4618, 411.1738, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 19, 35016, 650, 3, 1, 782.1198, 583.2101, 412.4743, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 20, 35016, 650, 3, 1, 746.5243, 615.868, 411.1725, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 21, 35016, 650, 3, 1, 747.375, 619.1094, 411.9709, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 22, 35016, 650, 3, 1, 746.9774, 618.7934, 411.9709, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 23, 35016, 650, 3, 1, 697.2847, 618.2535, 412.4758, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 24, 35016, 650, 3, 1, 792.2587, 598.2239, 412.4696, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 25, 35016, 650, 3, 1, 703.8837, 596.6007, 412.4742, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 26, 35016, 650, 3, 1, 714.4861, 581.7222, 412.476, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 27, 22515, 650, 3, 1, 746.9045, 618.2813, 411.1724, 0, 7200, 0, 0), -- World Trigger (Area: Trial of the Champion)
+(@CGUID+ 28, 35004, 650, 3, 1, 748.309, 619.4879, 411.1724, 4.712389, 7200, 0, 0), -- Jaeren Sunsworn (Area: Trial of the Champion)
+(@CGUID+ 29, 36558, 650, 3, 1, 717.4427, 660.6458, 412.4669, 4.921828, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 30, 36558, 650, 3, 1, 702.1649, 647.2674, 412.4749, 5.689773, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 31, 36558, 650, 3, 1, 726.8264, 661.2014, 412.4716, 4.660029, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 32, 34977, 650, 3, 1, 726.3802, 557.1511, 436.9785, 1.256637, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 33, 35016, 650, 3, 1, 712.4132, 653.9305, 412.4742, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 34, 34970, 650, 3, 1, 757.9983, 559.7309, 435.5007, 1.466077, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 35, 34979, 650, 3, 1, 712.8733, 563.1719, 436.9667, 1.029744, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 36, 34979, 650, 3, 1, 709.5764, 570.1059, 435.5041, 0.9424778, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 37, 35016, 650, 3, 1, 702.2743, 638.7604, 412.4703, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 38, 35016, 650, 3, 1, 795.5486, 618.25, 412.4769, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 39, 35016, 650, 3, 1, 780.4358, 654.4063, 412.4742, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 40, 34975, 650, 3, 1, 767.5816, 560.5399, 435.5033, 1.832596, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 41, 34996, 650, 3, 1, 746.5833, 559.0191, 435.4921, 1.570796, 7200, 0, 0), -- Highlord Tirion Fordring (Area: Trial of the Champion)
+(@CGUID+ 42, 35016, 650, 3, 1, 791.9722, 638.0104, 412.4699, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - Generic Bunny (Area: Trial of the Champion)
+(@CGUID+ 43, 34859, 650, 3, 1, 688.7309, 604.6893, 435.5013, 0.2094395, 7200, 0, 0), -- Orcish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 44, 34887, 650, 3, 1, 797.1476, 617.7083, 435.4885, 3.106686, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Alliance (Area: Trial of the Champion)
+(@CGUID+ 45, 34903, 650, 3, 1, 697.1163, 583.0521, 435.5041, 0.6283185, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Tauren (Area: Trial of the Champion)
+(@CGUID+ 46, 34857, 650, 3, 1, 692.8542, 590.632, 435.5041, 0.4712389, 7200, 0, 0), -- Troll Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 47, 34858, 650, 3, 1, 697.2413, 583.8577, 435.5041, 0.6283185, 7200, 0, 0), -- Tauren Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 48, 34857, 650, 3, 1, 689.6233, 598.0452, 435.5031, 0.3316126, 7200, 0, 0), -- Troll Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66371 - Sen'jin Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 49, 34966, 650, 3, 1, 718.9167, 564.0781, 435.5041, 1.117011, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 50, 34975, 650, 3, 1, 775.7483, 564.5851, 435.5041, 2.164208, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 51, 34966, 650, 3, 1, 725.6614, 560.8351, 435.5034, 1.239184, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 52, 34977, 650, 3, 1, 734.4114, 560.158, 435.501, 1.37881, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 53, 36558, 650, 3, 1, 788.0156, 650.7882, 412.4749, 3.804818, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 54, 36558, 650, 3, 1, 773.0972, 660.7327, 412.4673, 4.45059, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 55, 36558, 650, 3, 1, 793.0521, 642.8507, 412.4742, 3.630285, 7200, 0, 0), -- Argent Battleworg (Area: Trial of the Champion) (Auras: 67865 - Trample)
+(@CGUID+ 56, 34994, 650, 3, 1, 686.6632, 614.5608, 435.4849, 6.230825, 7200, 0, 0), -- Thrall (Area: Trial of the Champion)
+(@CGUID+ 57, 34977, 650, 3, 1, 730.9983, 552.7188, 438.8121, 1.343904, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 58, 34974, 650, 3, 1, 787.5018, 568.9618, 436.9922, 2.286381, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 59, 34974, 650, 3, 1, 781.3715, 567.4167, 435.5041, 2.408554, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 60, 34995, 650, 3, 1, 686.9358, 622.0295, 435.4867, 6.230825, 7200, 0, 0), -- Garrosh Hellscream (Area: Trial of the Champion)
+(@CGUID+ 61, 34856, 650, 3, 1, 801.5677, 591.3837, 435.5041, 2.670354, 7200, 0, 0), -- Dwarven Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 62, 34883, 650, 3, 1, 687.8299, 617.6493, 435.4933, 1.58825, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Horde (Area: Trial of the Champion)
+(@CGUID+ 63, 34856, 650, 3, 1, 804.0261, 598.4358, 435.503, 2.86234, 7200, 0, 0), -- Dwarven Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 64, 34902, 650, 3, 1, 689.1962, 597, 435.5034, 0.3490658, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Troll (Area: Trial of the Champion)
+(@CGUID+ 65, 34901, 650, 3, 1, 687.1597, 618.132, 435.4888, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Orc (Area: Trial of the Champion)
+(@CGUID+ 66, 34859, 650, 3, 1, 687.9653, 629.6111, 435.4982, 6.195919, 7200, 0, 0), -- Orcish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66369 - Orgrimmar Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 67, 34906, 650, 3, 1, 803.6215, 594.6302, 435.5041, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Dwarf (Area: Trial of the Champion)
+(@CGUID+ 68, 34859, 650, 3, 1, 685.1129, 600.4305, 436.9705, 0.2792527, 7200, 0, 0), -- Orcish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 69, 34868, 650, 3, 1, 798.6945, 587.3577, 435.5041, 2.687807, 7200, 0, 0), -- Draenei Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 70, 34870, 650, 3, 1, 804.4705, 604.8055, 435.5013, 2.844887, 7200, 0, 0), -- Human Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 71, 34858, 650, 3, 1, 696.2604, 577.507, 436.9658, 0.6981317, 7200, 0, 0), -- Tauren Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66370 - Thunder Bluff Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 72, 34868, 650, 3, 1, 793.882, 580.6788, 435.5041, 2.391101, 7200, 0, 0), -- Draenei Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 73, 34858, 650, 3, 1, 689.6354, 582.8229, 438.8188, 0.5585054, 7200, 0, 0), -- Tauren Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 74, 34970, 650, 3, 1, 764.0799, 553.434, 438.8278, 1.867502, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 75, 34966, 650, 3, 1, 718.4045, 555.9202, 438.8031, 1.151917, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 76, 34979, 650, 3, 1, 714.3403, 553.7083, 440.2231, 1.117011, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 77, 34970, 650, 3, 1, 761.217, 549.1424, 440.2457, 1.58825, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 78, 34977, 650, 3, 1, 733.809, 545.2153, 442.0747, 1.413717, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 79, 34990, 650, 3, 1, 806.3246, 617.9948, 435.4912, 3.124139, 7200, 0, 0), -- King Varian Wrynn (Area: Trial of the Champion)
+(@CGUID+ 80, 34992, 650, 3, 1, 806.2239, 614.9393, 435.4874, 3.001966, 7200, 0, 0), -- Lady Jaina Proudmoore (Area: Trial of the Champion)
+(@CGUID+ 81, 34975, 650, 3, 1, 773.5018, 555.5156, 438.8247, 1.954769, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 82, 34860, 650, 3, 1, 699.0052, 654.8941, 435.5041, 5.532694, 7200, 0, 0), -- Forsaken Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 83, 34870, 650, 3, 1, 805.0313, 629.7674, 435.5009, 3.385939, 7200, 0, 0), -- Human Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 84, 34905, 650, 3, 1, 696.3594, 653.5868, 435.5041, 5.602507, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Undead (Area: Trial of the Champion)
+(@CGUID+ 85, 34904, 650, 3, 1, 690.5955, 642, 435.5041, 5.88176, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Blood Elf (Area: Trial of the Champion)
+(@CGUID+ 86, 34869, 650, 3, 1, 806.5208, 644.8802, 436.9614, 3.543018, 7200, 0, 0), -- Gnomish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 87, 34909, 650, 3, 1, 800.1441, 651.7257, 437.002, 3.630285, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Night Elf (Area: Trial of the Champion)
+(@CGUID+ 88, 34908, 650, 3, 1, 799.4948, 582.9219, 436.9941, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Draenei (Area: Trial of the Champion)
+(@CGUID+ 89, 34900, 650, 3, 1, 813.5729, 618.1268, 438.8528, 3.159046, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Human (Area: Trial of the Champion)
+(@CGUID+ 90, 34910, 650, 3, 1, 805.7778, 640.0972, 435.6143, 0, 7200, 0, 0), -- [ph] Argent Raid Spectator - FX - Gnome (Area: Trial of the Champion)
+(@CGUID+ 91, 34868, 650, 3, 1, 799.1945, 575.25, 438.801, 2.373648, 7200, 0, 0), -- Draenei Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 92, 34861, 650, 3, 1, 686.3924, 643.3507, 436.9734, 5.88176, 7200, 0, 0), -- Blood Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 93, 34859, 650, 3, 1, 680.5989, 603.9861, 438.7939, 0.1919862, 7200, 0, 0), -- Orcish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 94, 34860, 650, 3, 1, 693.6354, 654.8924, 436.9629, 5.602507, 7200, 0, 0), -- Forsaken Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 95, 34856, 650, 3, 1, 808.9236, 586.0347, 440.2946, 2.635447, 7200, 0, 0), -- Dwarven Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 96, 34856, 650, 3, 1, 814.3316, 597.7813, 440.2612, 2.897247, 7200, 0, 0), -- Dwarven Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 97, 34857, 650, 3, 1, 684.9636, 591.0174, 438.8482, 0.418879, 7200, 0, 0), -- Troll Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66371 - Sen'jin Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 98, 34870, 650, 3, 1, 809.1111, 633.1337, 436.9589, 3.420845, 7200, 0, 0), -- Human Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+ 99, 34856, 650, 3, 1, 807.6233, 595.1649, 436.9687, 2.80998, 7200, 0, 0), -- Dwarven Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+100, 34868, 650, 3, 1, 800.2813, 582.7483, 436.9739, 2.583087, 7200, 0, 0), -- Draenei Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+101, 34856, 650, 3, 1, 813.6354, 587.592, 442.0691, 2.70526, 7200, 0, 0), -- Dwarven Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+102, 34860, 650, 3, 1, 686.8663, 650.8368, 438.7787, 5.759586, 7200, 0, 0), -- Forsaken Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66365 - Undercity Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+103, 34871, 650, 3, 1, 799.3472, 648.0243, 435.5041, 3.560472, 7200, 0, 0), -- Night Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+104, 34857, 650, 3, 1, 675.2813, 589.9879, 442.0812, 0.3839724, 7200, 0, 0), -- Troll Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+105, 34870, 650, 3, 1, 808.1927, 601.9358, 436.9788, 2.80998, 7200, 0, 0), -- Human Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+106, 34871, 650, 3, 1, 805.4722, 648.7205, 436.9274, 3.508112, 7200, 0, 0), -- Night Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+107, 34868, 650, 3, 1, 806.4879, 574.6146, 442.076, 2.495821, 7200, 0, 0), -- Draenei Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+108, 34857, 650, 3, 1, 675.1146, 597.7188, 442.0728, 0.2792527, 7200, 0, 0), -- Troll Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+109, 34859, 650, 3, 1, 685.118, 634.4045, 436.9757, 6.091199, 7200, 0, 0), -- Orcish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66369 - Orgrimmar Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+110, 34858, 650, 3, 1, 688.0121, 573.8524, 442.0741, 0.6632251, 7200, 0, 0), -- Tauren Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66370 - Thunder Bluff Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+111, 34861, 650, 3, 1, 692.4063, 644.8698, 435.5041, 5.8294, 7200, 0, 0), -- Blood Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66360 - Silvermoon Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+112, 34859, 650, 3, 1, 677.9861, 634.1024, 440.2452, 6.126106, 7200, 0, 0), -- Orcish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+113, 34869, 650, 3, 1, 803.8958, 639.0643, 435.5034, 3.455752, 7200, 0, 0), -- Gnomish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+114, 34861, 650, 3, 1, 689.4358, 639.2587, 435.5034, 5.951573, 7200, 0, 0), -- Blood Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66360 - Silvermoon Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+115, 34858, 650, 3, 1, 682.8559, 586.1996, 440.2427, 0.4712389, 7200, 0, 0), -- Tauren Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66370 - Thunder Bluff Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+116, 34869, 650, 3, 1, 807.9583, 636.7726, 436.9755, 3.368485, 7200, 0, 0), -- Gnomish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+117, 34871, 650, 3, 1, 795.6719, 653.7396, 435.5041, 3.752458, 7200, 0, 0), -- Night Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66368 - Darnassus Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+118, 34975, 650, 3, 1, 779.9965, 550.6945, 442.0774, 2.059489, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+119, 34974, 650, 3, 1, 783.0695, 561.1771, 438.7979, 2.303835, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+120, 34966, 650, 3, 1, 721.9705, 548.191, 442.0721, 1.239184, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+121, 34970, 650, 3, 1, 769.9514, 547.875, 442.0723, 1.797689, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+122, 34974, 650, 3, 1, 790.6077, 559.2691, 442.0727, 2.408554, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+123, 34979, 650, 3, 1, 700.2726, 559.2239, 442.0803, 0.9250245, 7200, 0, 0), -- Argent Crusade Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+124, 34869, 650, 3, 1, 818.5121, 640.5989, 442.0783, 3.385939, 7200, 0, 0), -- Gnomish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+125, 34870, 650, 3, 1, 818.1632, 607.1302, 440.209, 2.949606, 7200, 0, 0), -- Human Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+126, 34869, 650, 3, 1, 813.5018, 644.8768, 440.2538, 3.490659, 7200, 0, 0), -- Gnomish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+127, 34860, 650, 3, 1, 690.4861, 661.6614, 440.2092, 5.550147, 7200, 0, 0), -- Forsaken Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66365 - Undercity Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+128, 34861, 650, 3, 1, 677.1702, 640.7396, 442.0688, 6.003932, 7200, 0, 0), -- Blood Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura)
+(@CGUID+129, 34871, 650, 3, 1, 800.1945, 660.7292, 438.7687, 3.822271, 7200, 0, 0), -- Night Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66368 - Darnassus Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+130, 34870, 650, 3, 1, 818.1337, 626.9636, 440.2178, 3.281219, 7200, 0, 0), -- Human Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+131, 34869, 650, 3, 1, 813.3004, 650.717, 442.0732, 3.490659, 7200, 0, 0), -- Gnomish Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66366 - Gnomeregan Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+132, 34861, 650, 3, 1, 679.9809, 648.8785, 440.1984, 5.864306, 7200, 0, 0), -- Blood Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66360 - Silvermoon Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+133, 34860, 650, 3, 1, 684.0695, 656.6805, 442.074, 5.689773, 7200, 0, 0), -- Forsaken Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow, 66365 - Undercity Pennant, 55944 - Spectator - Cheer Aura)
+(@CGUID+134, 34871, 650, 3, 1, 810.6077, 659.8299, 442.0864, 3.682645, 7200, 0, 0); -- Night Elf Coliseum Spectator (Area: Trial of the Champion) (Auras: 66321 - [DND] Spawn Grow; 55944 - Spectator - Cheer Aura)
+
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+134;
+INSERT INTO `creature_addon` (`guid`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(@CGUID+18, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+19, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+20, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+21, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+22, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+23, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+24, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+25, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+26, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+32, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+33, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+34, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+35, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+36, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+37, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+38, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+39, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+40, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+42, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - Generic Bunny
+(@CGUID+43, 0, 0x0, 0x1, '66321 55944'), -- Orcish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+44, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Alliance
+(@CGUID+45, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Tauren
+(@CGUID+46, 0, 0x0, 0x1, '66321 55944'), -- Troll Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+47, 0, 0x0, 0x1, '66321 55944'), -- Tauren Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+48, 0, 0x0, 0x1, '66321 66371 55944'), -- Troll Coliseum Spectator - 66321 - [DND] Spawn Grow, 66371 - Sen'jin Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+49, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+50, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+51, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+52, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+57, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+58, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+59, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+61, 0, 0x0, 0x1, '66321 66363 55944'), -- Dwarven Coliseum Spectator - 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+62, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Horde
+(@CGUID+63, 0, 0x0, 0x1, '66321 55944'), -- Dwarven Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+64, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Troll
+(@CGUID+65, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Orc
+(@CGUID+66, 0, 0x0, 0x1, '66321 66369 55944'), -- Orcish Coliseum Spectator - 66321 - [DND] Spawn Grow, 66369 - Orgrimmar Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+67, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Dwarf
+(@CGUID+68, 0, 0x0, 0x1, '66321 55944'), -- Orcish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+69, 0, 0x0, 0x1, '66321 55944'), -- Draenei Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+70, 0, 0x0, 0x1, '66321 66367 55944'), -- Human Coliseum Spectator - 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+71, 0, 0x0, 0x1, '66321 66370 55944'), -- Tauren Coliseum Spectator - 66321 - [DND] Spawn Grow, 66370 - Thunder Bluff Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+72, 0, 0x0, 0x1, '66321 66362 55944'), -- Draenei Coliseum Spectator - 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+73, 0, 0x0, 0x1, '66321 55944'), -- Tauren Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+74, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+75, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+76, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+77, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+78, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+81, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+82, 0, 0x0, 0x1, '66321 55944'), -- Forsaken Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+83, 0, 0x0, 0x1, '66321 66367 55944'), -- Human Coliseum Spectator - 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+84, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Undead
+(@CGUID+85, 0, 0x0, 0x1, ''), -- [ph] Argent Raid Spectator - FX - Blood Elf
+(@CGUID+86, 0, 0x0, 0x1, '66321 55944'), -- Gnomish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+91, 0, 0x0, 0x1, '66321 66362 55944'), -- Draenei Coliseum Spectator - 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+92, 0, 0x0, 0x1, '66321 55944'), -- Blood Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+93, 0, 0x0, 0x1, '66321 55944'), -- Orcish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+94, 0, 0x0, 0x1, '66321 55944'), -- Forsaken Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+95, 0, 0x0, 0x1, '66321 55944'), -- Dwarven Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+96, 0, 0x0, 0x1, '66321 66363 55944'), -- Dwarven Coliseum Spectator - 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+97, 0, 0x0, 0x1, '66321 66371 55944'), -- Troll Coliseum Spectator - 66321 - [DND] Spawn Grow, 66371 - Sen'jin Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+98, 0, 0x0, 0x1, '66321 66367 55944'), -- Human Coliseum Spectator - 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+99, 0, 0x0, 0x1, '66321 66363 55944'), -- Dwarven Coliseum Spectator - 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+100, 0, 0x0, 0x1, '66321 66362 55944'), -- Draenei Coliseum Spectator - 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+101, 0, 0x0, 0x1, '66321 66363 55944'), -- Dwarven Coliseum Spectator - 66321 - [DND] Spawn Grow, 66363 - Ironforge Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+102, 0, 0x0, 0x1, '66321 66365 55944'), -- Forsaken Coliseum Spectator - 66321 - [DND] Spawn Grow, 66365 - Undercity Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+103, 0, 0x0, 0x1, '66321 55944'), -- Night Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+104, 0, 0x0, 0x1, '66321 55944'), -- Troll Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+105, 0, 0x0, 0x1, '66321 66367 55944'), -- Human Coliseum Spectator - 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+106, 0, 0x0, 0x1, '66321 55944'), -- Night Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+107, 0, 0x0, 0x1, '66321 66362 55944'), -- Draenei Coliseum Spectator - 66321 - [DND] Spawn Grow, 66362 - Exodar Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+108, 0, 0x0, 0x1, '66321 55944'), -- Troll Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+109, 0, 0x0, 0x1, '66321 66369 55944'), -- Orcish Coliseum Spectator - 66321 - [DND] Spawn Grow, 66369 - Orgrimmar Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+110, 0, 0x0, 0x1, '66321 66370 55944'), -- Tauren Coliseum Spectator - 66321 - [DND] Spawn Grow, 66370 - Thunder Bluff Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+111, 0, 0x0, 0x1, '66321 66360 55944'), -- Blood Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 66360 - Silvermoon Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+112, 0, 0x0, 0x1, '66321 55944'), -- Orcish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+113, 0, 0x0, 0x1, '66321 55944'), -- Gnomish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+114, 0, 0x0, 0x1, '66321 66360 55944'), -- Blood Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 66360 - Silvermoon Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+115, 0, 0x0, 0x1, '66321 66370 55944'), -- Tauren Coliseum Spectator - 66321 - [DND] Spawn Grow, 66370 - Thunder Bluff Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+116, 0, 0x0, 0x1, '66321 55944'), -- Gnomish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+117, 0, 0x0, 0x1, '66321 66368 55944'), -- Night Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 66368 - Darnassus Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+118, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+119, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+120, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+121, 0, 0x0, 0x1, '66321 66361 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 66361 - Argent Crusade Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+122, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+123, 0, 0x0, 0x1, '66321 55944'), -- Argent Crusade Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+124, 0, 0x0, 0x1, '66321 55944'), -- Gnomish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+125, 0, 0x0, 0x1, '66321 66367 55944'), -- Human Coliseum Spectator - 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+126, 0, 0x0, 0x1, '66321 55944'), -- Gnomish Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+127, 0, 0x0, 0x1, '66321 66365 55944'), -- Forsaken Coliseum Spectator - 66321 - [DND] Spawn Grow, 66365 - Undercity Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+128, 0, 0x0, 0x1, '66321 55944'), -- Blood Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 55944 - Spectator - Cheer Aura
+(@CGUID+129, 0, 0x0, 0x1, '66321 66368 55944'), -- Night Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 66368 - Darnassus Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+130, 0, 0x0, 0x1, '66321 66367 55944'), -- Human Coliseum Spectator - 66321 - [DND] Spawn Grow, 66367 - Stormwind Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+131, 0, 0x0, 0x1, '66321 66366 55944'), -- Gnomish Coliseum Spectator - 66321 - [DND] Spawn Grow, 66366 - Gnomeregan Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+132, 0, 0x0, 0x1, '66321 66360 55944'), -- Blood Elf Coliseum Spectator - 66321 - [DND] Spawn Grow, 66360 - Silvermoon Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+133, 0, 0x0, 0x1, '66321 66365 55944'), -- Forsaken Coliseum Spectator - 66321 - [DND] Spawn Grow, 66365 - Undercity Pennant, 55944 - Spectator - Cheer Aura
+(@CGUID+134, 0, 0x0, 0x1, '66321 55944'); -- Night Elf Coliseum Spectator - 66321 - [DND] Spawn Grow; 55944 - Spectator - Cheer Aura
+
+DELETE FROM `gameobject` WHERE `map`=650;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(@OGUID+ 0, 195479, 650, 3, 1, 746.1556, 549.4642, 412.8809, 4.71239, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Doodad_InstancePortal_Green_10Man01 (Area: 0)
+(@OGUID+ 1, 195480, 650, 3, 1, 746.1556, 549.4642, 412.8809, 1.570796, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Doodad_InstancePortal_Green_25Man01 (Area: 0)
+(@OGUID+ 2, 195478, 650, 3, 1, 746.1556, 549.4642, 412.8809, 1.570796, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Doodad_InstancePortal_Green_10Man_Heroic01 (Area: 0)
+(@OGUID+ 3, 195481, 650, 3, 1, 746.1556, 549.4642, 412.8809, 1.570796, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Doodad_InstancePortal_Green_25Man_Heroic01 (Area: 0)
+(@OGUID+ 4, 195486, 650, 3, 1, 813.1198, 617.5898, 413.0305, 0, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Doodad_InstanceNewPortal_Purple_Skull01 (Area: 0)
+(@OGUID+ 5, 195477, 650, 3, 1, 813.1296, 617.6323, 413.0386, 0, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Doodad_InstanceNewPortal_Purple07 (Area: 0)
+(@OGUID+ 6, 195650, 650, 3, 1, 804.6328, 618.0554, 412.6763, 3.141593, 0, 0, 0.7071069, 0.7071066, 86400, 255, 0), -- North Portcullis (Area: Trial of the Champion)
+(@OGUID+ 7, 195649, 650, 3, 1, 688.7698, 618.0554, 412.704, 3.141593, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- South Portcullis (Area: Trial of the Champion)
+(@OGUID+ 8, 195648, 650, 3, 1, 746.6458, 560.1208, 412.704, 1.570796, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- East Portcullis (Area: Trial of the Champion)
+(@OGUID+ 9, 195647, 650, 3, 1, 746.6976, 677.4688, 412.3391, 1.570796, 0, 0, 0.7071069, 0.7071066, 86400, 255, 1), -- Main Gate (Area: Trial of the Champion)
+(@OGUID+10, 196398, 650, 3, 1, 784.533, 660.2379, 412.3891, 5.567601, 0, 0, 0, 1, 86400, 255, 1), -- Lance Rack (Area: Trial of the Champion)
+(@OGUID+11, 196398, 650, 3, 1, 801.6632, 624.8055, 412.3444, 4.939284, 0, 0, 0, 1, 86400, 255, 1), -- Lance Rack (Area: Trial of the Champion)
+(@OGUID+12, 195485, 650, 3, 1, 844.6845, 623.4078, 159.1088, 0, 0, 0, 0.7071069, 0.7071066, 86400, 255, 0), -- Web Door (Area: Trial of the Champion)
+(@OGUID+13, 196398, 650, 3, 1, 692.1268, 610.5746, 412.3466, 1.850049, 0, 0, 0, 1, 86400, 255, 1), -- Lance Rack (Area: Trial of the Champion)
+(@OGUID+14, 196398, 650, 3, 1, 710.3246, 660.7083, 412.3868, 0.6981314, 0, 0, 0, 1, 86400, 255, 1), -- Lance Rack (Area: Trial of the Champion)
+(@OGUID+15, 195709, 650, 1, 1, 744.7205, 618.3073, 411.0891, 1.53589, 0, 0, 0, 1, -86400, 255, 1), -- Champion's Cache (Area: Trial of the Champion)
+(@OGUID+16, 195374, 650, 1, 1, 748.7604, 618.309, 411.0891, 1.588249, 0, 0, 0, 1, -86400, 255, 1), -- Eadric's Cache (Area: Trial of the Champion)
+(@OGUID+17, 195323, 650, 1, 1, 748.7778, 618.3524, 411.0891, 1.570796, 0, 0, 0, 1, -86400, 255, 1), -- Confessor's Cache (Area: 0)
+(@OGUID+18, 195710, 650, 2, 1, 744.7205, 618.3073, 411.0891, 1.53589, 0, 0, 0, 1, -86400, 255, 1), -- Champion's Cache (Area: Trial of the Champion)
+(@OGUID+19, 195375, 650, 2, 1, 748.7604, 618.309, 411.0891, 1.588249, 0, 0, 0, 1, -86400, 255, 1), -- Eadric's Cache (Area: Trial of the Champion)
+(@OGUID+20, 195324, 650, 2, 1, 748.7778, 618.3524, 411.0891, 1.570796, 0, 0, 0, 1, -86400, 255, 1); -- Confessor's Cache (Area: 0)
+
+UPDATE `creature_model_info` SET `bounding_radius`=1, `combat_reach`=1.5 WHERE `modelid`=29639; -- 29639
+UPDATE `creature_model_info` SET `bounding_radius`=1, `combat_reach`=1.5 WHERE `modelid`=29640; -- 29640
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519, `combat_reach`=1.725 WHERE `modelid`=29643; -- 29643
+UPDATE `creature_model_info` SET `bounding_radius`=0.306, `combat_reach`=1.5 WHERE `modelid`=29644; -- 29644
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747, `combat_reach`=4.05 WHERE `modelid`=29645; -- 29645
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747, `combat_reach`=4.05 WHERE `modelid`=29646; -- 29646
+UPDATE `creature_model_info` SET `bounding_radius`=0.306, `combat_reach`=1.5 WHERE `modelid`=29648; -- 29648
+UPDATE `creature_model_info` SET `bounding_radius`=0.306, `combat_reach`=1.5 WHERE `modelid`=29650; -- 29650
+UPDATE `creature_model_info` SET `bounding_radius`=0.383, `combat_reach`=1.5 WHERE `modelid`=29651; -- 29651
+UPDATE `creature_model_info` SET `bounding_radius`=0.383, `combat_reach`=1.5 WHERE `modelid`=29652; -- 29652
+UPDATE `creature_model_info` SET `bounding_radius`=0.383, `combat_reach`=1.5 WHERE `modelid`=29654; -- 29654
+UPDATE `creature_model_info` SET `bounding_radius`=0.383, `combat_reach`=1.5 WHERE `modelid`=29655; -- 29655
+UPDATE `creature_model_info` SET `bounding_radius`=0.372, `combat_reach`=1.5 WHERE `modelid`=29659; -- 29659
+UPDATE `creature_model_info` SET `bounding_radius`=0.372, `combat_reach`=1.5 WHERE `modelid`=29660; -- 29660
+UPDATE `creature_model_info` SET `bounding_radius`=0.306, `combat_reach`=1.5 WHERE `modelid`=29570; -- 29570
+UPDATE `creature_model_info` SET `bounding_radius`=0.306, `combat_reach`=1.5 WHERE `modelid`=29571; -- 29571
+UPDATE `creature_model_info` SET `bounding_radius`=0.208, `combat_reach`=1.5 WHERE `modelid`=29572; -- 29572
+UPDATE `creature_model_info` SET `bounding_radius`=0.347, `combat_reach`=1.5 WHERE `modelid`=29574; -- 29574
+UPDATE `creature_model_info` SET `bounding_radius`=0.347, `combat_reach`=1.5 WHERE `modelid`=29575; -- 29575
+UPDATE `creature_model_info` SET `bounding_radius`=1, `combat_reach`=1.5 WHERE `modelid`=29576; -- 29576
+UPDATE `creature_model_info` SET `bounding_radius`=1, `combat_reach`=1.5 WHERE `modelid`=29577; -- 29577
+UPDATE `creature_model_info` SET `bounding_radius`=0.372, `combat_reach`=1.5 WHERE `modelid`=29578; -- 29578
+UPDATE `creature_model_info` SET `bounding_radius`=0.372, `combat_reach`=1.5 WHERE `modelid`=29579; -- 29579
+UPDATE `creature_model_info` SET `bounding_radius`=0.383, `combat_reach`=1.5 WHERE `modelid`=29580; -- 29580
+UPDATE `creature_model_info` SET `bounding_radius`=0.383, `combat_reach`=1.5 WHERE `modelid`=29581; -- 29581
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747, `combat_reach`=4.05 WHERE `modelid`=29582; -- 29582
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747, `combat_reach`=4.05 WHERE `modelid`=29583; -- 29583
+UPDATE `creature_model_info` SET `bounding_radius`=0.4596, `combat_reach`=1.8 WHERE `modelid`=29894; -- 29894
+UPDATE `creature_model_info` SET `bounding_radius`=0.347, `combat_reach`=1.5 WHERE `modelid`=29634; -- 29634
+UPDATE `creature_model_info` SET `bounding_radius`=0.347, `combat_reach`=1.5 WHERE `modelid`=29635; -- 29635
+UPDATE `creature_model_info` SET `bounding_radius`=0.306, `combat_reach`=1.5 WHERE `modelid`=29636; -- 29636
+UPDATE `creature_model_info` SET `bounding_radius`=0.208, `combat_reach`=1.5 WHERE `modelid`=29638; -- 29638
+
+UPDATE `creature_template` SET `scale`=1 WHERE `entry` IN (34871, 34869, 34856, 34975, 34970, 34868, 34870, 34977, 34974, 34966, 34979, 34860, 34859, 34861, 34857, 34858);
+
+UPDATE `creature_template` SET `spell1`=68505, `spell2`=62575,`spell3`=68282,`spell4`=62552 WHERE `entry` IN (36558,33322);
diff --git a/sql/updates/world/2014_09_14_04_world_toc5.sql b/sql/updates/world/2014_09_14_04_world_toc5.sql
new file mode 100644
index 00000000000..81975bd08ee
--- /dev/null
+++ b/sql/updates/world/2014_09_14_04_world_toc5.sql
@@ -0,0 +1,32 @@
+DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (35637, 35633, 35768, 34658, 35636, 35638, 35635, 35640, 35641, 35634, 35491);
+INSERT INTO `vehicle_template_accessory` (`entry`, `accessory_entry`, `seat_id`, `minion`, `description`, `summontype`, `summontimer`) VALUES
+(35637, 34705, 0, 0, 'Marshal Jacob Alerius'' Mount - Marshal Jacob Alerius <Grand Champion of Stormwind>', 8, 0),
+(35633, 34702, 0, 0, 'Ambrose Boltspark''s Mount - Ambrose Boltspark', 8, 0),
+(35768, 34701, 0, 0, 'Colosos'' Mount - Colosos', 8, 0),
+(34658, 34657, 0, 0, 'Jaelyne Evensong''s Mount - Jaelyne Evensong', 8, 0),
+(35636, 34703, 0, 0, 'Lana Stouthammer''s Mount - Lana Stouthammer <Grand Champion of Ironforge>', 8, 0),
+
+(35638, 35572, 0, 0, 'Mokra the Skullcrusher''s Mount - Mokra the Skullcrusher <Grand Champion of Orgrimmar>', 8, 0),
+(35635, 35569, 0, 0, 'Eressea Dawnsinger''s Mount - Eressea Dawnsinger', 8, 0),
+(35640, 35571, 0, 0, 'Runok Wildmane''s Mount - Runok Wildmane', 8, 0),
+(35641, 35570, 0, 0, 'Zul''tore''s Mount - Zul''tore', 8, 0),
+(35634, 35617, 0, 0, 'Deathstalker Visceri''s Mount - Deathstalker Visceri', 8, 0),
+
+(35491, 35451, 0, 0, 'Black Knight''s Skeletal Gryphon - The Black Knight', 8, 0);
+
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (35637, 35633, 35768, 34658, 35636, 35638, 35635, 35640, 35641, 35634, 35491);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES
+(35637, 46598, 0, 0),
+(35633, 46598, 0, 0),
+(35768, 46598, 0, 0),
+(34658, 46598, 0, 0),
+(35636, 46598, 0, 0),
+
+(35638, 46598, 0, 0),
+(35635, 46598, 0, 0),
+(35640, 46598, 0, 0),
+(35641, 46598, 0, 0),
+(35634, 46598, 0, 0),
+
+(35491, 46598, 0, 0);
diff --git a/sql/updates/world/2014_09_15_00_world_misc.sql b/sql/updates/world/2014_09_15_00_world_misc.sql
new file mode 100644
index 00000000000..857441399a1
--- /dev/null
+++ b/sql/updates/world/2014_09_15_00_world_misc.sql
@@ -0,0 +1,85 @@
+SET @CGuid := 129851;
+
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`faction`=21, `unit_flags`=32832 WHERE `entry`=31283;
+UPDATE `creature_template` SET `AIName`= 'SmartAI',`flags_extra`=128 WHERE `entry`=32406;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=31290;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=31316;
+
+DELETE FROM `creature` WHERE `id` IN(31283,31316,37967,38505);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 31283, 571, 1, 1, 5826.424, 2029.934, 503.993, 5.951573, 120, 0, 0), -- 31283 (Area: 210)
+(@CGUID+1, 31316, 571, 1, 1, 5894.918, 2027.746, 513.1389, 3.212954, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+2, 31316, 571, 1, 1, 5873.27, 2020.346, 506.469, 2.86509, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+4, 37967, 571, 1, 1, 5699.498, 2143.675, 798.1427, 1.710423, 120, 0, 0), -- 37967 (Area: 210)
+(@CGUID+5, 37967, 571, 1, 1, 5683.006, 2145.111, 798.1452, 1.186824, 120, 0, 0), -- 37967 (Area: 210)
+(@CGUID+6, 37967, 571, 1, 1, 5679.912, 2107.91, 798.1375, 6.230825, 120, 0, 0), -- 37967 (Area: 210)
+(@CGUID+7, 37967, 571, 1, 1, 5691.881, 2090.5, 798.1375, 2.181662, 120, 0, 0), -- 37967 (Area: 210)
+(@CGUID+8, 31316, 571, 1, 1, 5851.897, 2064.396, 504.0805, 4.502924, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+9, 31316, 571, 1, 1, 5869.164, 2064.59, 504.6295, 3.909517, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+10, 38505, 571, 1, 1, 5897.904, 2104.522, 636.1191, 3.206179, 120, 0, 0), -- 38505 (Area: 210)
+(@CGUID+11, 31316, 571, 1, 1, 5890.246, 2049.392, 512.1957, 3.944444, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+12, 31316, 571, 1, 1, 5868.647, 2049.936, 504.2659, 3.490694, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+13, 37967, 571, 1, 1, 5652.406, 2089.361, 798.1375, 1.710423, 120, 0, 0), -- 37967 (Area: 210)
+(@CGUID+14, 31316, 571, 1, 1, 5829.46, 2031.393, 503.99, 1.32645, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+15, 31316, 571, 1, 1, 5831.737, 2024.352, 503.9846, 2.722714, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+16, 31316, 571, 1, 1, 5830.665, 1991.727, 503.9239, 1.727821, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+17, 31316, 571, 1, 1, 5859.231, 1992.497, 505.6942, 2.356147, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+18, 31316, 571, 1, 1, 5879.035, 1999.875, 509.5721, 2.598193, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+19, 31316, 571, 1, 1, 5866.767, 1990.259, 507.4477, 2.698404, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+20, 31316, 571, 1, 1, 5834.902, 2001.664, 503.9163, 1.867513, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+21, 31316, 571, 1, 1, 5922.788, 2040.055, 517.6266, 3.787891, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+22, 31316, 571, 1, 1, 5809.299, 1981.393, 503.9012, 3.176498, 120, 0, 0), -- 31316 (Area: 210)
+(@CGUID+23, 31316, 571, 1, 1, 5881.739, 1963.927, 517.0669, 1.012561, 120, 0, 0); -- 31316 (Area: 210)
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN(31283,32406);
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=32406;
+
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(31283, 0, 0, 0, 0, 0, '55667'),
+(32406, 0, 0, 0, 0, 0, '60977 60984');
+
+DELETE FROM `creature_text` WHERE `entry` IN(31283,31290);
+
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(31283, 0, 0, 'Ah, the hand of the Ebon Blade has finally come to claim me. I tremble in fear.', 14, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31283, 1, 0, 'Hah! That''s all you''ve got? I''m surprised you even made it to the citadel.', 14, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31283, 2, 0, 'The Lich King has given me power beyond your wildest nightmares. Behold!', 14, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31283, 3, 0, 'It all ends here.', 14, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31283, 4, 0, '%s chuckles knowingly.', 16, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31283, 5, 0, 'The Lich King shall extinquish... every... last... one... of you.', 14, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31283, 6, 0, 'There you are Darion! I was wondering when you''d crawl forth!', 14, 0, 100, 0, 0, 0, 'Orbaz Bloodbane'),
+(31290, 0, 0, 'Orbaz Bloodbane, self proclaimed hand of the Lich King.', 14, 0, 100, 0, 0, 0, 'Highlord Darion Mograine'),
+(31290, 1, 0, 'Couldn''t wait for me to be out of the way so that you could sieze control?', 14, 0, 100, 0, 0, 0, 'Highlord Darion Mograine'),
+(31290, 2, 0, 'You''ll never have what it takes to lead anything, Orbaz, not even a legion of mindless skeletons.', 14, 0, 100, 0, 0, 0, 'Highlord Darion Mograine'),
+(31290, 3, 0, 'Good riddance.', 14, 0, 100, 0, 0, 0, 'Highlord Darion Mograine');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(31283,31290,3128300,3129000,3129001,31316);
+
+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
+(31316,0,0,0,1,0,100,0,0,15000,15000,30000,11,58962,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ebon Blade Reaper - OOC - Cast Summon Death Knight Adept'),
+(31316,0,1,0,11,0,100,0,0,0,0,0,8,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Ebon Blade Reaper - On Spawn - Set Defensive'),
+
+(31283,0,0,0,4,0,100,0,0,0,0,0,80,3128300,2,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - On Agro - Run Script'),
+(31283,0,1,0,0,0,100,0,1500,5000,15000,20000,11,61015,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - IC - Cast Empower Runeblade'),
+(31283,0,2,0,9,0,100,0,0,5,9000,15000,11,60186,0,0,0,0,0,7,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - On Range - Cast Plague Strike'),
+(31283,0,3,0,0,0,100,0,15000,20000,7000,9000,11,60987,0,0,0,0,0,2,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - IC - Cast Summon Ominous Cloud'),
+(31283,0,4,0,2,0,100,1,0,50,0,0,11,58939,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - On Less than 50% HP - Cast Summon Darion Morgraine'),
+(31283,0,5,6,6,0,100,1,0,0,0,0,1,5,5000,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - On Death - Say Line 6'),
+(31283,0,6,0,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,31290,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - On Death Set Data (Darion Morgraine)'),
+(31290,0,0,1,54,0,100,0,0,0,0,0,80,3129000,2,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - On Just Summoned - Run Script'),
+(31290,0,1,0,61,0,100,0,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - On Just Summoned - Set Agressive'),
+(31290,0,2,0,38,0,100,0,1,1,0,0,80,3129001,2,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - On Data Set - Run Script 2'),
+(3129000,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,19,31283,0,0,0,0,0,0,'Darion Morgraine - Script - Face Orbaz Bloodbane'),
+(3129000,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - Script - Say Line 1'),
+(3129000,9,2,0,0,0,100,0,7000,7000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - Script - Say Line 2'),
+(3129000,9,3,0,0,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,31283,0,0,0,0,0,0,'Darion Morgraine - Script - Attack Orbaz Bloodbane'),
+(3129000,9,4,0,0,0,100,0,7000,7000,0,0,1,6,0,0,0,0,0,19,31283,0,0,0,0,0,0,'Darion Morgraine - Script - Say Line 7 (Orbaz Bloodbane)'),
+(3129000,9,5,0,0,0,100,0,0,0,0,0,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - Script - Set Home Position'),
+(3129000,9,6,0,0,0,100,0,7000,7000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - Script - Say Line 3'),
+(3129001,9,0,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - Script 2 - Say Line 4'),
+(3129001,9,1,0,0,0,100,0,10000,10000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Darion Morgraine - Script 2 - Despawn'),
+(3128300,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - Script - Say Line 1'),
+(3128300,9,1,0,0,0,100,0,8000,8000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - Script - Say Line 2'),
+(3128300,9,2,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - Script - Say Line 3'),
+(3128300,9,3,0,0,0,100,0,8000,8000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - Script - Say Line 4'),
+(3128300,9,4,0,0,0,100,0,5000,5000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,'Orbaz Bloodbane <The Hand of Suffering> - Script - Say Line 5');
diff --git a/sql/updates/world/2014_09_15_01_world_gameobject_template.sql b/sql/updates/world/2014_09_15_01_world_gameobject_template.sql
new file mode 100644
index 00000000000..033308dd642
--- /dev/null
+++ b/sql/updates/world/2014_09_15_01_world_gameobject_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `gameobject_template` SET `flags`=32 WHERE `entry`=194569; -- Ulduar Teleporter
diff --git a/sql/updates/world/2014_09_15_02_world_misc.sql b/sql/updates/world/2014_09_15_02_world_misc.sql
new file mode 100644
index 00000000000..adcd7b8a9f2
--- /dev/null
+++ b/sql/updates/world/2014_09_15_02_world_misc.sql
@@ -0,0 +1,11 @@
+UPDATE `creature_text` SET `BroadcastTextID`=31261 WHERE `entry`=31283 AND `groupid`=1;
+UPDATE `creature_text` SET `BroadcastTextID`=31962 WHERE `entry`=31283 AND `groupid`=2;
+UPDATE `creature_text` SET `BroadcastTextID`=31963 WHERE `entry`=31283 AND `groupid`=3;
+UPDATE `creature_text` SET `BroadcastTextID`=31966 WHERE `entry`=31283 AND `groupid`=4;
+UPDATE `creature_text` SET `BroadcastTextID`=31967 WHERE `entry`=31283 AND `groupid`=5;
+UPDATE `creature_text` SET `BroadcastTextID`=31964 WHERE `entry`=31283 AND `groupid`=6;
+UPDATE `creature_text` SET `BroadcastTextID`=31259 WHERE `entry`=31283 AND `groupid`=0;
+UPDATE `creature_text` SET `BroadcastTextID`=31975 WHERE `entry`=31290 AND `groupid`=0;
+UPDATE `creature_text` SET `BroadcastTextID`=31977 WHERE `entry`=31290 AND `groupid`=1;
+UPDATE `creature_text` SET `BroadcastTextID`=31978 WHERE `entry`=31290 AND `groupid`=3;
+UPDATE `creature_text` SET `BroadcastTextID`=31983 WHERE `entry`=31290 AND `groupid`=2;
diff --git a/sql/updates/world/2014_09_15_03_world_misc.sql b/sql/updates/world/2014_09_15_03_world_misc.sql
new file mode 100644
index 00000000000..050904b458c
--- /dev/null
+++ b/sql/updates/world/2014_09_15_03_world_misc.sql
@@ -0,0 +1,11 @@
+DELETE FROM `creature` WHERE `id` IN(27685,27534);
+
+UPDATE `creature_text` SET `BroadcastTextID`=31259 WHERE `entry`=31283;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(27564,27749) AND `source_type`=0 AND `id`=15;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =27725 AND `source_type`=0 AND `id`=1;
+
+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
+(27564, 0, 15, 0, 1, 0, 100, 0, 0, 5000, 0, 10000, 11, 49329, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Alliance Conscript - OOC - Cast Summon Frigid Ghoul Attacker'),
+(27749, 0, 15, 0, 1, 0, 100, 0, 0, 5000, 0, 10000, 11, 49329, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Horde Conscript - OOC - Cast Summon Frigid Ghoul Attacker'),
+(27725, 0, 1, 0, 1, 0, 100, 0, 0, 5000, 5000, 15000, 11, 49068, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Ruby Guardian - OOC - Cast Summon Frigid Ghoul');
diff --git a/sql/updates/world/2014_09_15_04_world_misc.sql b/sql/updates/world/2014_09_15_04_world_misc.sql
new file mode 100644
index 00000000000..78640c6bbcc
--- /dev/null
+++ b/sql/updates/world/2014_09_15_04_world_misc.sql
@@ -0,0 +1,36 @@
+UPDATE `creature_text` SET `BroadcastTextID`=31959 WHERE `entry`=31283 AND `groupid`=0;
+
+DELETE FROM `creature` WHERE `id`=37967 AND `guid` IN(301114,301113,201624,201533,201463,201187,201040,200950,200929,200916,200915,88778,88777,88769,88768,88767,88766,88765,88764,88763,88762,88761,88760,88759,88758,88757,88756,88755,88754,88753,88752);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES
+(301114, 37967, 571, 1, 256, 0, 0, 5685.95, 2306.58, 798.126, 1.83668, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(301113, 37967, 571, 1, 256, 0, 0, 5683.06, 2305.81, 798.126, 1.83689, 120, 0, 0, 1, 0, 2, 0, 0, 0),
+(201624, 37967, 631, 15, 1, 0, 0, -36.6615, 2192.81, 27.9859, 2.56563, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(201533, 37967, 631, 15, 1, 0, 0, -110.885, 2168.82, 30.7375, 1.29154, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(201463, 37967, 631, 15, 1, 0, 0, -80.7847, 2152.99, 30.7375, 1.53589, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(201187, 37967, 631, 15, 1, 0, 0, -21.0608, 2204.75, 30.199, 3.10669, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(201040, 37967, 631, 15, 1, 0, 0, -65.3351, 2154.12, 30.7375, 1.76278, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(200929, 37967, 631, 15, 1, 0, 0, -51.9722, 2168.76, 30.7375, 1.64061, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(200916, 37967, 631, 15, 1, 0, 0, -59.7222, 2188.21, 27.9859, 1.53589, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(200915, 37967, 631, 15, 1, 0, 0, -102.934, 2167.01, 30.7375, 1.43117, 86400, 0, 0, 13033, 0, 0, 0, 0, 0),
+(88752, 37967, 571, 1, 1, 0, 0, 5606.21, 2012.55, 798.125, 0.994838, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88753, 37967, 571, 1, 1, 0, 0, 5636.09, 2104.31, 798.138, 5.61996, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88754, 37967, 571, 1, 1, 0, 0, 5638.31, 1998.9, 798.13, 1.58825, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88755, 37967, 571, 1, 1, 0, 0, 5652.41, 2089.36, 798.138, 1.71042, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88756, 37967, 571, 1, 1, 0, 0, 5669, 2017.95, 798.125, 2.46091, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88757, 37967, 571, 1, 1, 0, 0, 5679.91, 2107.91, 798.138, 6.23082, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88758, 37967, 571, 1, 1, 0, 0, 5683.01, 2145.11, 798.145, 1.18682, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88759, 37967, 571, 1, 1, 0, 0, 5691.88, 2090.5, 798.138, 2.18166, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88760, 37967, 571, 1, 1, 0, 0, 5699.5, 2143.68, 798.143, 1.71042, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88761, 37967, 571, 1, 256, 0, 0, 5606.21, 2012.55, 798.125, 0.994838, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88762, 37967, 571, 1, 256, 0, 0, 5636.09, 2104.31, 798.138, 5.61996, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88763, 37967, 571, 1, 256, 0, 0, 5638.31, 1998.9, 798.13, 1.58825, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88764, 37967, 571, 1, 256, 0, 0, 5652.41, 2089.36, 798.138, 1.71042, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88765, 37967, 571, 1, 256, 0, 0, 5669, 2017.95, 798.125, 2.46091, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88766, 37967, 571, 1, 256, 0, 0, 5679.91, 2107.91, 798.138, 6.23082, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88767, 37967, 571, 1, 256, 0, 0, 5683.01, 2145.11, 798.145, 1.18682, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88768, 37967, 571, 1, 256, 0, 0, 5691.88, 2090.5, 798.138, 2.18166, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88769, 37967, 571, 1, 256, 0, 0, 5699.5, 2143.68, 798.143, 1.71042, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(88777, 37967, 571, 1, 256, 0, 0, 5683.06, 2305.81, 798.126, 1.83689, 120, 0, 0, 1, 0, 2, 0, 0, 0),
+(88778, 37967, 571, 1, 256, 0, 0, 5685.95, 2306.58, 798.126, 1.83668, 120, 0, 0, 1, 0, 0, 0, 0, 0),
+(200950, 37967, 631, 15, 1, 0, 0, -33.0694, 2197.31, 27.9859, 2.1293, 86400, 0, 0, 13033, 0, 0, 0, 0, 0);
+
diff --git a/sql/updates/world/2014_09_16_00_world_achievement_criteria_data.sql b/sql/updates/world/2014_09_16_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..8667fc7e560
--- /dev/null
+++ b/sql/updates/world/2014_09_16_00_world_achievement_criteria_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` = 7361 AND `type` = 12;
+INSERT INTO `achievement_criteria_data`(`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(7361, 12, 1, 0, '');
diff --git a/sql/updates/world/2014_09_16_01_world_misc.sql b/sql/updates/world/2014_09_16_01_world_misc.sql
new file mode 100644
index 00000000000..0460f99191e
--- /dev/null
+++ b/sql/updates/world/2014_09_16_01_world_misc.sql
@@ -0,0 +1,33 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN(13,17) AND `SourceEntry`=39246;
+
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 4, 39246, 0, 0, 31, 0, 3, 22105, 0, 0, 0, 0, '', 'Target needs to be Decrepit Clefthoof'),
+(13, 4, 39246, 0, 0, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Target needs to be Decrepit Clefthoof');
+
+UPDATE `spell_dbc` SET `Effect1`=28,`EffectMiscValueB1`=64 WHERE `Id`IN(39240,39241,39245,39247);
+
+UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry` IN(22482,22038);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(22482,22038) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(2248200,2203800) 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
+(22482, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - On Just Summoned - Set Passive'),
+(22482, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2248200, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - On Just Summoned - Run Script'),
+(22482, 0, 2, 3, 4, 0, 100, 0, 0, 0, 0, 0, 28, 37751, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - On Agro - Remove Aura - Submerged'),
+(22482, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 37752, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - On Agro - Cast Stand'),
+(22482, 0, 4, 0, 0, 0, 100, 0, 0, 5000, 3000, 7000, 11, 31747, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Mature Boneshifter <The Bone Emperor> - IC - Cast Poison'),
+(22038, 0, 0, 1, 54, 0, 100, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - On Just Summoned - Set Passive'),
+(22038, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 80, 2203800, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - On Just Summoned - Run Script'),
+(22038, 0, 2, 3, 4, 0, 100, 0, 0, 0, 0, 0, 28, 37751, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - On Agro - Remove Aura - Submerged'),
+(22038, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 37752, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - On Agro - Cast Stand'),
+(22038, 0, 4, 0, 0, 0, 100, 0, 0, 3000, 3000, 5000, 11, 31747, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - On Agro - Cast Poison'),
+(2248200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 37751, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - Script - Cast Cast Submerged'),
+(2248200, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 37989, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - Script - Cast Tunnel Bore Bone Passive'),
+(2248200, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Mature Bone Sifter - Script - Set Agressive'),
+(2203800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 37751, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - Script - Cast Cast Submerged'),
+(2203800, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 11, 38885, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - Script - Cast Damaging Tunnel Bore Bone Passive'),
+(2203800, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hai shulud <The Bone Emperor> - Script - Set Agressive');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22105 AND `id`>2;
+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
+(22105, 0, 3, 0, 8, 0, 100, 1, 39246, 0, 0, 0, 41, 3000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Decrepit Clefthoof - On Spellhit (Fumping) - Despawn');
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 49397e90df6..13b2a602d31 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13949,11 +13949,18 @@ void Unit::SetControlled(bool apply, UnitState state)
{
case UNIT_STATE_STUNNED:
SetStunned(true);
+ // i need to stop fear on stun and root or i will get teleport to destination issue as MVMGEN for fear keeps going on
+ if (HasUnitState(UNIT_STATE_FLEEING))
+ SetFeared(false);
CastStop();
break;
case UNIT_STATE_ROOT:
if (!HasUnitState(UNIT_STATE_STUNNED))
+ {
SetRooted(true);
+ if (HasUnitState(UNIT_STATE_FLEEING))
+ SetFeared(false);
+ }
break;
case UNIT_STATE_CONFUSED:
if (!HasUnitState(UNIT_STATE_STUNNED))
@@ -14014,16 +14021,17 @@ void Unit::SetControlled(bool apply, UnitState state)
ClearUnitState(state);
- if (HasUnitState(UNIT_STATE_STUNNED))
+ // Unit States might have been already cleared but auras still present. I need to check with HasAuraType
+ if (HasAuraType(SPELL_AURA_MOD_STUN))
SetStunned(true);
else
{
- if (HasUnitState(UNIT_STATE_ROOT))
+ if (HasAuraType(SPELL_AURA_MOD_ROOT))
SetRooted(true);
- if (HasUnitState(UNIT_STATE_CONFUSED))
+ if (HasAuraType(SPELL_AURA_MOD_CONFUSE))
SetConfused(true);
- else if (HasUnitState(UNIT_STATE_FLEEING))
+ else if (HasAuraType(SPELL_AURA_MOD_FEAR))
SetFeared(true);
}
}
diff --git a/src/server/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp
index 9c0bdd5d558..8bd5bbf5a90 100644
--- a/src/server/game/Server/Protocol/PacketLog.cpp
+++ b/src/server/game/Server/Protocol/PacketLog.cpp
@@ -93,7 +93,8 @@ void PacketLog::Initialize()
header.SniffStartTicks = getMSTime();
header.OptionalDataSize = 0;
- fwrite(&header, sizeof(header), 1, _file);
+ if (CanLogPacket())
+ fwrite(&header, sizeof(header), 1, _file);
}
}
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index c82ab30eaae..df80429f6de 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -769,8 +769,8 @@ public:
handler->PSendSysMessage(npcFlagTexts[i].Name, npcFlagTexts[i].Value);
handler->PSendSysMessage(LANG_NPCINFO_MECHANIC_IMMUNE, mechanicImmuneMask);
- for (uint8 i = 0; i < MAX_MECHANIC; ++i)
- if ((mechanicImmuneMask << 1) & mechanicImmunes[i].Value)
+ for (uint8 i = 1; i < MAX_MECHANIC; ++i)
+ if (mechanicImmuneMask & (1 << (mechanicImmunes[i].Value - 1)))
handler->PSendSysMessage("%s (0x%X)", mechanicImmunes[i].Name, mechanicImmunes[i].Value);
return true;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index ec7aa742975..1d2ed933243 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -68,7 +68,7 @@ class boss_salramm : public CreatureScript
events.ScheduleEvent(EVENT_CURSE_FLESH, 30000);
events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000));
events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000));
- events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer
+ events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer
}
void ExecuteEvent(uint32 eventId) override
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 62c85491a20..0a6b2e88b26 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -153,7 +153,7 @@ public:
SetCombatMovement(true);
_Reset();
-
+ me->SetReactState(REACT_AGGRESSIVE);
instance->SetData(DATA_ONYXIA_PHASE, Phase);
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
@@ -162,12 +162,10 @@ public:
{
_EnterCombat();
Talk(SAY_AGGRO);
-
events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000));
events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000));
events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000));
events.ScheduleEvent(EVENT_WING_BUFFET, urand(10000, 20000));
-
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
}
@@ -331,9 +329,10 @@ public:
{
if (HealthBelowPct(65))
{
+ if (Unit* target = me->GetVictim())
+ tankGUID = target->GetGUID();
SetCombatMovement(false);
Phase = PHASE_BREATH;
- tankGUID = me->GetVictim()->GetGUID();
me->SetReactState(REACT_PASSIVE);
me->AttackStop();
me->GetMotionMaster()->MovePoint(10, Phase2Location);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 949ee652d81..a8d3f223664 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -173,6 +173,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
break;
case NPC_ANUBARAK:
AnubarakGUID = creature->GetGUID();
+ creature->SetRespawnDelay(7 * DAY);
break;
default:
break;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 0be61cc2ec8..18b9a3040fe 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -397,8 +397,9 @@ class boss_xt002 : public CreatureScript
Talk(SAY_HEART_CLOSED);
Talk(EMOTE_HEART_CLOSED);
- DoCast(me, SPELL_STAND);
+ me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetReactState(REACT_AGGRESSIVE);
+ DoCast(me, SPELL_STAND);
_phase = 1;
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 6ace4eb61a1..a31aff259d1 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -150,7 +150,7 @@ class boss_svala : public CreatureScript
void Reset() override
{
_Reset();
-
+
SetCombatMovement(true);
if (_introCompleted)
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index 82f101980fe..5baaebc0d7b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -40,7 +40,6 @@ enum Says
enum Spells
{
SPELL_MORTAL_WOUND = 30641,
- H_SPELL_MORTAL_WOUND = 36814,
SPELL_SURGE = 34645,
SPELL_RETALIATION = 22857
};
@@ -78,7 +77,6 @@ class boss_watchkeeper_gargolmar : public CreatureScript
}
void MoveInLineOfSight(Unit* who) override
-
{
if (!me->GetVictim() && me->CanCreatureAttack(who))
{
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 8373752ee1f..92eeef5e8a8 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -280,8 +280,8 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
- target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
- target->AddUnitState(UNIT_STATE_ROOT);
+ target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+ target->AddUnitState(UNIT_STATE_ROOT);
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h
index d1f143aeb1e..dfff60a380b 100644
--- a/src/server/shared/Networking/Socket.h
+++ b/src/server/shared/Networking/Socket.h
@@ -148,7 +148,7 @@ protected:
return true;
_isWritingAsync = true;
-
+
#ifdef BOOST_ASIO_HAS_IOCP
MessageBuffer& buffer = _writeQueue.front();
_socket.async_write_some(boost::asio::buffer(buffer.GetReadPointer(), buffer.GetActiveSize()), std::bind(&Socket<T>::WriteHandler,
diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h
index 47bd7794a4c..dbe2b8ec902 100644
--- a/src/server/shared/Networking/SocketMgr.h
+++ b/src/server/shared/Networking/SocketMgr.h
@@ -97,7 +97,7 @@ public:
int32 GetNetworkThreadCount() const { return _threadCount; }
protected:
- SocketMgr() : _threads(nullptr), _threadCount(1)
+ SocketMgr() : _acceptor(nullptr), _threads(nullptr), _threadCount(1)
{
}