Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp

10 files changed, 91 insertions, 23 deletions

diff --git a/sql/updates/world/2013_08_16_01_world_sai.sql b/sql/updates/world/2013_08_16_02_world_sai.sql
index 643eeaa9dd6..43cfcb6f02c 100644
--- a/sql/updates/world/2013_08_16_01_world_sai.sql
+++ b/sql/updates/world/2013_08_16_02_world_sai.sql
@@ -36,23 +36,23 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 
 DELETE FROM `waypoints` WHERE `entry` IN (@LETOLL,@RESEARCHER,@LETOLL*100);
 INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@LETOLL,0,-3728.1,5385.5,-3.41,''),
-(@LETOLL,1,-3735.9,5392.8,-4.8,''),
-(@LETOLL,2,-3729.7,5381,-4.9,''),
-(@LETOLL,3,-3704.6, 5372.74, -9.33,''),
-(@LETOLL,4,-3704.8,5374.7,-8.9,''),
-(@LETOLL,5,-3623.2,5403.2,-11.5,''),
-(@LETOLL,6,-3554.6,5455.2,-11.3,''),
-(@LETOLL,7,-3557.7,5468.9,-8.1,''),
-(@LETOLL,8,-3548.9,5458.3,-12.3,''),
-(@RESEARCHER,0,-3725.1,5381.9,-4.4,''),
-(@RESEARCHER,1,-3735.7,5390.7,-5.7,''),
-(@RESEARCHER,2,-3728.4,5384.1,-3.4,''),
-(@RESEARCHER,3,-3703.1,5371.4,-10.1,''),
-(@RESEARCHER,4,-3619.6,5400.8,-12.1,''),
-(@RESEARCHER,5,-3554.2,5451.1,-11.8,''),
-(@RESEARCHER,6,-3563.1,5462.8,-6.5,''),
-(@RESEARCHER,7,-3551.1,5454,-11.9,'');
+(@LETOLL,1,-3728.1,5385.5,-3.41,''),
+(@LETOLL,2,-3735.9,5392.8,-4.8,''),
+(@LETOLL,3,-3729.7,5381,-4.9,''),
+(@LETOLL,4,-3704.6, 5372.74, -9.33,''),
+(@LETOLL,5,-3704.8,5374.7,-8.9,''),
+(@LETOLL,6,-3623.2,5403.2,-11.5,''),
+(@LETOLL,7,-3554.6,5455.2,-11.3,''),
+(@LETOLL,8,-3557.7,5468.9,-8.1,''),
+(@LETOLL,9,-3548.9,5458.3,-12.3,''),
+(@RESEARCHER,1,-3725.1,5381.9,-4.4,''),
+(@RESEARCHER,2,-3735.7,5390.7,-5.7,''),
+(@RESEARCHER,3,-3728.4,5384.1,-3.4,''),
+(@RESEARCHER,4,-3703.1,5371.4,-10.1,''),
+(@RESEARCHER,5,-3619.6,5400.8,-12.1,''),
+(@RESEARCHER,6,-3554.2,5451.1,-11.8,''),
+(@RESEARCHER,7,-3563.1,5462.8,-6.5,''),
+(@RESEARCHER,8,-3551.1,5454,-11.9,'');
 
 
 UPDATE `creature_template` SET `AIname`='SmartAI' WHERE `entry` IN (@LETOLL,@RESEARCHER,@B_SIFTER);
@@ -63,21 +63,21 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (@LETOLL,0,1,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Say line 0'),
 (@LETOLL,0,2,3,40,0,100,0,1,@LETOLL,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Pause WP'),
 (@LETOLL,0,3,10,61,0,100,0,0,0,0,0,80,@LETOLL*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Start Timed Event'),
-(@LETOLL,0,4,5,40,0,100,0,7,@LETOLL,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Set emote digging'),
+(@LETOLL,0,4,5,40,0,100,0,8,@LETOLL,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Set emote digging'),
 (@LETOLL,0,5,0,61,0,100,0,0,0,0,0,45,0,2,0,0,0,0,10,78837,@RESEARCHER,0,0,0,0,0,'On Link - Set Data'),
-(@LETOLL,0,6,7,40,0,100,0,8,@LETOLL,0,0,17,467,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Set emote digging'),
+(@LETOLL,0,6,7,40,0,100,0,9,@LETOLL,0,0,17,467,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Set emote digging'),
 (@LETOLL,0,7,8,61,0,100,0,0,0,0,0,45,0,3,0,0,0,0,10,78837,@RESEARCHER,0,0,0,0,0,'On Link - Set Data'),
 (@LETOLL,0,8,0,61,0,100,0,0,0,0,0,80,@LETOLL*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Start Timed Event'),
-(@LETOLL,0,9,0,40,0,100,0,6,@LETOLL,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Say line 3'),
+(@LETOLL,0,9,0,40,0,100,0,7,@LETOLL,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Say line 3'),
 (@LETOLL,0,10,0,61,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Set npc flag'),
 (@LETOLL,0,11,0,40,0,100,0,7,@LETOLL,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Pause WP'),
 --
 (-@RESEARCHER1,0,0,0,38,0,100,0,0,1,0,0,53,0,@RESEARCHER,0,0,0,0,1,0,0,0,0,0,0,0,'On Data - Start WP'),
-(-@RESEARCHER1,0,1,2,40,0,100,0,5,@RESEARCHER,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,' On Data - Start WP'),
+(-@RESEARCHER1,0,1,2,40,0,100,0,6,@RESEARCHER,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,' On Data - Start WP'),
 (-@RESEARCHER1,0,2,0,61,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,'On link - Start digging'),
-(-@RESEARCHER1,0,3,4,40,0,100,0,6,@RESEARCHER,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Pause WP'),
+(-@RESEARCHER1,0,3,4,40,0,100,0,7,@RESEARCHER,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Pause WP'),
 (-@RESEARCHER1,0,4,0,61,0,100,0,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,'On link - Start digging'),
-(-@RESEARCHER1,0,5,6,40,0,100,0,7,@RESEARCHER,0,0,54,35500,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Pause WP'),
+(-@RESEARCHER1,0,5,6,40,0,100,0,8,@RESEARCHER,0,0,54,35500,0,0,0,0,0,1,0,0,0,0,0,0,0,'On WP reached - Pause WP'),
 (-@RESEARCHER1,0,6,0,61,0,100,0,0,0,0,0,80,@RESEARCHER*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'ON WP reached - Start Timed Event'),
 (-@RESEARCHER1,0,7,0,11,0,100,0,0,0,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On Respawn - Set Emote State none'),
 -- 
diff --git a/sql/updates/world/2013_08_16_03_world_misc.sql b/sql/updates/world/2013_08_16_03_world_misc.sql
new file mode 100644
index 00000000000..9e49d79be4d
--- /dev/null
+++ b/sql/updates/world/2013_08_16_03_world_misc.sql
@@ -0,0 +1,5 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (127445, 127446, 127447);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(127445, 0, 26751, 0, 1, 0, ''),
+(127446, 0, 26751, 0, 1, 0, ''),
+(127447, 0, 26751, 0, 1, 0, '');
diff --git a/sql/updates/world/2013_08_16_04_world_SAI.sql b/sql/updates/world/2013_08_16_04_world_SAI.sql
new file mode 100644
index 00000000000..359f46e3d60
--- /dev/null
+++ b/sql/updates/world/2013_08_16_04_world_SAI.sql
@@ -0,0 +1,48 @@
+-- Unleash the Raptors (11147)
+SET @EVENT         := 15363;
+SET @RAPTOR        := 23741;
+SET @QUEST_CREDIT  := 23727;
+
+DELETE FROM `event_scripts` WHERE `id`= @EVENT;
+INSERT INTO `event_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(@EVENT,0,8,@QUEST_CREDIT,1,0,0,0,0,0),
+(@EVENT,0,10,@RAPTOR,600000,0,-2617.885,-3277.134,31.93436,0.541052),
+(@EVENT,0,10,@RAPTOR,600000,0,-2621.778,-3275.271,30.62537,0.296706),
+(@EVENT,0,10,@RAPTOR,600000,0,-2620.451,-3279.923,31.8134,0.296706),
+(@EVENT,0,10,@RAPTOR,600000,0,-2482.963,-3240.589,40.96778,2.495821),
+(@EVENT,0,10,@RAPTOR,600000,0,-2481.632,-3245.017,43.09342,2.583087),
+(@EVENT,0,10,@RAPTOR,600000,0,-2479.413,-3239.004,40.06413,2.530727),
+(@EVENT,0,10,@RAPTOR,600000,0,-2524.415,-3128.137,29.7597,0.3316126),
+(@EVENT,0,10,@RAPTOR,600000,0,-2527.19,-3125.763,29.5518,0.3839724),
+(@EVENT,0,10,@RAPTOR,600000,0,-2526.191,-3131.122,29.00879,0.2792527);
+
+UPDATE `creature_template` SET AIName='SmartAI' WHERE entry=@RAPTOR;
+DELETE FROM `smart_scripts` WHERE entryorguid IN (@RAPTOR);
+INSERT INTO `smart_scripts` VALUES
+(@RAPTOR,0,0,0,54,0,100,0,0,0,0,0,53,1,@RAPTOR,0,0,0,0,1,0,0,0,0,0,0,0,'Captured Raptor - On Summon - Start WayPoint'),
+(@RAPTOR,0,1,0,54,0,100,0,0,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captured Raptor - Summon - Aggresive'),
+(@RAPTOR,0,2,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,0,0,0,0,0,0,0,'Captured Raptor - Summon - Attack Random Hostile'),
+(@RAPTOR,0,3,0,1,0,100,1,60000,60000,60000,60000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Captured Raptor - OOC 60 Secs - Despawn'),
+(@RAPTOR,0,4,0,1,0,100,1,25000,25000,25000,25000,53,1,@RAPTOR,0,0,0,0,1,0,0,0,0,0,0,0,'Captured Raptor - OOC 25 Secs - Start WayPoint');
+
+DELETE FROM `waypoints` WHERE entry IN (@RAPTOR);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@RAPTOR,1,-2457.79, -3169.9, 35.109,'Captured Raptor'),
+(@RAPTOR,2,-2446.18, -3176.67, 34.5238,'Captured Raptor'),
+(@RAPTOR,3,-2436.55, -3170.93, 35.8081,'Captured Raptor'),
+(@RAPTOR,4,-2428.23, -3146.74, 35.8573,'Captured Raptor'),
+(@RAPTOR,5,-2444.57, -3138.12, 35.8598,'Captured Raptor'),
+(@RAPTOR,6,-2457.32, -3146.25, 35.4215,'Captured Raptor'),
+(@RAPTOR,7,-2468, -3161.3, 34.8617,'Captured Raptor');
+
+-- Missing spell focus
+DELETE FROM `gameobject` WHERE `id` = 124154;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES 
+(76870, 124154, 1, 1, 1, -2456.02, -3150.7, 35.8358, 4.69274, 0, 0, 0.714019, -0.700126, 300, 0, 1);
+
+-- Missing gameobject template
+DELETE FROM `gameobject_template` WHERE `entry`= 124154;
+INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `faction`, `flags`, `size`, `questItem1`, `questItem2`, `questItem3`, `questItem4`, `questItem5`, `questItem6`, `data0`, `data1`, `data2`, `data3`, `data4`, `data5`, `data6`, `data7`, `data8`, `data9`, `data10`, `data11`, `data12`, `data13`, `data14`, `data15`, `data16`, `data17`, `data18`, `data19`, `data20`, `data21`, `data22`, `data23`, `AIName`, `ScriptName`, `WDBVerified`) VALUES 
+(124154, 8, 1287, 'TEMP Blackhoof Village Windmill', '', '', '', 0, 0, 1, 0, 0, 0, 0, 0, 0, 1459, 10, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', '', 1);
+-- Hack field
+UPDATE `quest_template` SET `RequiredSpellCast1`=0 WHERE `Id`=11147;
diff --git a/sql/updates/world/2013_08_17_00_world_misc.sql b/sql/updates/world/2013_08_17_00_world_misc.sql
new file mode 100644
index 00000000000..b16f1bb4eb3
--- /dev/null
+++ b/sql/updates/world/2013_08_17_00_world_misc.sql
@@ -0,0 +1,4 @@
+UPDATE `instance_template` SET `script`='instance_the_stockade' WHERE `map`=34;
+-- Bazil Thredd should be the last boss in the instance, not Dextren Ward
+UPDATE `instance_encounters` SET `lastEncounterDungeon`=12 WHERE `entry`=539;
+UPDATE `instance_encounters` SET `lastEncounterDungeon`=0 WHERE `entry`=540;
diff --git a/sql/updates/world/2013_08_17_01_world_misc.sql b/sql/updates/world/2013_08_17_01_world_misc.sql
new file mode 100644
index 00000000000..42555f591bf
--- /dev/null
+++ b/sql/updates/world/2013_08_17_01_world_misc.sql
@@ -0,0 +1 @@
+UPDATE `instance_template` SET `script`='instance_ragefire_chasm' WHERE `map`=389;
diff --git a/sql/updates/world/2013_08_17_02_world_misc.sql b/sql/updates/world/2013_08_17_02_world_misc.sql
new file mode 100644
index 00000000000..2bfcba9de44
--- /dev/null
+++ b/sql/updates/world/2013_08_17_02_world_misc.sql
@@ -0,0 +1,2 @@
+-- Applicable id for made up GO template
+UPDATE `gameobject_template` SET `entry`=300149 WHERE  `entry`=124154;
diff --git a/sql/updates/world/2013_08_17_03_world_misc.sql b/sql/updates/world/2013_08_17_03_world_misc.sql
new file mode 100644
index 00000000000..31bc3d9dd34
--- /dev/null
+++ b/sql/updates/world/2013_08_17_03_world_misc.sql
@@ -0,0 +1,2 @@
+UPDATE `instance_template` SET `script`='instance_the_underbog' WHERE `map`=546;
+UPDATE `instance_template` SET `script`='instance_the_slave_pens' WHERE `map`=547;
diff --git a/sql/updates/world/2013_08_17_04_world_misc.sql b/sql/updates/world/2013_08_17_04_world_misc.sql
new file mode 100644
index 00000000000..0ecc2ada335
--- /dev/null
+++ b/sql/updates/world/2013_08_17_04_world_misc.sql
@@ -0,0 +1,2 @@
+UPDATE `instance_template` SET `script`='instance_maraudon' WHERE `map`=349;
+UPDATE `instance_template` SET `script`='instance_dire_maul' WHERE `map`=429;
diff --git a/sql/updates/world/2013_08_17_05_world_misc.sql b/sql/updates/world/2013_08_17_05_world_misc.sql
new file mode 100644
index 00000000000..8c0283e7616
--- /dev/null
+++ b/sql/updates/world/2013_08_17_05_world_misc.sql
@@ -0,0 +1 @@
+UPDATE `gameobject` SET `id`=300149 WHERE `guid`=76870;
diff --git a/sql/updates/world/2013_08_18_00_world_spell_script_names_335.sql b/sql/updates/world/2013_08_18_00_world_spell_script_names_335.sql
new file mode 100644
index 00000000000..cadf3fb221f
--- /dev/null
+++ b/sql/updates/world/2013_08_18_00_world_spell_script_names_335.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` = 60144;
+INSERT INTO `spell_script_names`(`spell_id`, `ScriptName`) VALUES
+(60144, 'spell_hun_viper_attack_speed');