Merge heads.

--HG--
branch : trunk

14 files changed, 69 insertions, 73 deletions

diff --git a/sql/updates/427_world_scripts.sql b/sql/updates/427_world_scripts.sql
index 62ea5d39d5d..b6fe5fb7acb 100644
--- a/sql/updates/427_world_scripts.sql
+++ b/sql/updates/427_world_scripts.sql
@@ -1,47 +1,47 @@
-Update `instance_template` set `script`='instance_scarlet_monastery' where `map`='189';
-Update `gameobject_template` set `ScriptName`='go_loosely_turned_soil' where`entry`='186314';
+UPDATE `instance_template` SET `script`='instance_scarlet_monastery' WHERE `map`='189';
+UPDATE `gameobject_template` SET `ScriptName`='go_loosely_turned_soil' WHERE `entry`='186314';
 
-update `creature_template` set `scriptname`='boss_headless_horseman',
+UPDATE `creature_template` SET `ScriptName`='boss_headless_horseman',
 `minlevel`=70, `maxlevel`=70, `minhealth`=67068, `maxhealth`=67068,
 `minmana`=3155, `maxmana`=3155, `type`=6
- where `entry` = 23682;
+ WHERE `entry` = 23682;
 
-update `creature_template` set `scriptname`='mob_head',
+UPDATE `creature_template` SET `ScriptName`='mob_head',
  `minlevel`=70, `maxlevel`=70, `type`=6, `modelid_h`=21908,
 `minhealth`=24300, `maxhealth`=24300,
 `faction_A`=14, `faction_H`=14
-where `entry` = 23775;
+WHERE `entry` = 23775;
 
-update `creature_template` set `scriptname`='mob_pulsing_pumpkin',
+UPDATE `creature_template` SET `ScriptName`='mob_pulsing_pumpkin',
 `faction_A`=14, `faction_H`=14, `type`=6,
 `minlevel`=70, `maxlevel`=70,
 `minhealth`=9781, `maxhealth`=9781,
 `minmana`=3155, `maxmana`=3155
-where `entry` = 23694;
+WHERE `entry` = 23694;
 
 -- helper
-Update `creature_template` set `scriptname`='mob_wisp_invis',
+UPDATE `creature_template` SET `ScriptName`='mob_wisp_invis',
 `faction_A`=35, `faction_H`=35,
-`unit_flags`='33554434' where `entry`='23686';
+`unit_flags`='33554434' WHERE `entry`='23686';
 
 -- pumpkin fiend
-Update `creature_template` set
+UPDATE `creature_template` SET
  `minlevel`=70, `maxlevel`=70,
 `faction_A`=14, `faction_H`=14,
 `type`=6
-where `entry`='23545';
+WHERE `entry`='23545';
 
 -- wisp
-Update `creature_template` set `scriptname`='mob_wisp_invis',
+UPDATE `creature_template` SET `ScriptName`='mob_wisp_invis',
 `modelid_a`=21342, `modelid_h`=21342,
 `faction_A`=35, `faction_H`=35, `unit_flags`='33554434'
-where `entry`='24034';
+WHERE `entry`='24034';
 
-update `creature_template` set `equipment_id`=23682 where `entry` = 23682;
+UPDATE `creature_template` SET `equipment_id`=23682 WHERE `entry` = 23682;
 replace into`creature_equip_template` (`entry`, `equipmodel1`, `equipmodel2`, `equipmodel3`, `equipinfo1`, `equipinfo2`, `equipinfo3`, `equipslot1`, `equipslot2`, `equipslot3`)
 VALUES (23682, 50495, 0, 0, 33490690, 0, 0, 781, 0, 0);
 
-Replace into `script_texts` values
+REPLACE INTO `script_texts` VALUES
 (-1189001, 'It is over, your search is done! Let fate choose now, the righteous one',0,0,0,0,0,0,0,0,11961,1,0,'Headless Horseman SAY_ENTRANCE'),
 
 (-1189002, 'Here\'s my body, fit and pure! Now, your blackened souls I\'ll cure!',0,0,0,0,0,0,0,0,12567,1,0,'Headless Horseman SAY_REJOINED'),
@@ -54,4 +54,4 @@ Replace into `script_texts` values
 
 (-1189006, 'Your body lies beaten, battered and broken. Let my curse be your own, fate has spoken',0,0,0,0,0,0,0,0,11962,0,0,'Headless Horseman SAY_PLAYER_DEATH'),
 
-(-1189007, 'This end have I reached before. What new adventure lies in store?',0,0,0,0,0,0,0,0,11964,0,0,'Headless Horseman SAY_DEATH');
\ No newline at end of file
+(-1189007, 'This end have I reached before. What new adventure lies in store?',0,0,0,0,0,0,0,0,11964,0,0,'Headless Horseman SAY_DEATH');
diff --git a/sql/updates/452_world.sql b/sql/updates/452_world.sql
index c5ac7f87cfb..3b549278fc7 100644
--- a/sql/updates/452_world.sql
+++ b/sql/updates/452_world.sql
@@ -1,9 +1,9 @@
 -- link gift of the wild to mark of the wild
 
-DELETE FROM spell_chain WHERE spell_id = 21849;
-DELETE FROM spell_chain WHERE spell_id = 21850;
-DELETE FROM spell_chain WHERE spell_id = 26991;
+DELETE FROM `spell_chain` WHERE `spell_id` = 21849;
+DELETE FROM `spell_chain` WHERE `spell_id` = 21850;
+DELETE FROM `spell_chain` WHERE `spell_id` = 26991;
 
-INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21849,0,1126,1,0);
-INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21850,21849,1126,2,0);
-INSERT INTO spell_chain (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26991,21850,1126,3,0);
\ No newline at end of file
+INSERT INTO `spell_chain` (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21849,0,1126,1,0);
+INSERT INTO `spell_chain` (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (21850,21849,1126,2,0);
+INSERT INTO `spell_chain` (spell_id,prev_spell,first_spell,rank,req_spell) VALUES (26991,21850,1126,3,0);
diff --git a/sql/updates/455_world.sql b/sql/updates/455_world.sql
index 74c52f164b0..a40de1b77f3 100644
--- a/sql/updates/455_world.sql
+++ b/sql/updates/455_world.sql
@@ -1,9 +1,9 @@
 -- demon fire
-update creature_template set spell1 = 40029, flags_extra = 128, scriptname = '' where entry = 23069;
+UPDATE `creature_template` SET spell1 = 40029, flags_extra = 128, ScriptName = '' WHERE entry = 23069;
 -- pillar of fire
-update creature_template set spell1 = 43218, flags_extra = 128, scriptname = '' where entry = 24187;
+UPDATE `creature_template` SET spell1 = 43218, flags_extra = 128, ScriptName = '' WHERE entry = 24187;
 -- Broggok Poison Cloud
-update creature_template set spell1 = 30914, flags_extra = 128, scriptname = '' where entry = 17662;
+UPDATE `creature_template` SET spell1 = 30914, flags_extra = 128, ScriptName = '' WHERE entry = 17662;
 
 
 INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43468, 44007, 1, 'Storm Eye Safe Zone');
@@ -11,4 +11,4 @@ INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `commen
 INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43654, 0, 'Electrical Arc Visual');
 INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43655, 0, 'Electrical Arc Visual');
 INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43656, 0, 'Electrical Arc Visual');
-INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43659, 0, 'Electrical Arc Visual');
\ No newline at end of file
+INSERT INTO spell_linked_spell (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES (43658, 43659, 0, 'Electrical Arc Visual');
diff --git a/sql/updates/471_world.sql b/sql/updates/471_world.sql
index 637c999fdea..2db368326e8 100644
--- a/sql/updates/471_world.sql
+++ b/sql/updates/471_world.sql
@@ -1,9 +1,2 @@
-UPDATE gameobject_template SET faction=1375 WHERE entry IN (184203, 184204, 184205);
-UPDATE gameobject_template SET Scriptname='go_bridge_console' WHERE entry=184568;
-
-DELETE FROM gameobject WHERE id IN (184205, 184204, 184203, 184568);
-INSERT INTO gameobject (id, map, spawnMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES
-(184568, 548, 1, 47.7806, -582.962, 2.88104, 3.14159, 0, 0, 1, 0, 0, 1, 1),
-(184203, 548, 1, 26.198, -654.59, 15.5, 3.14159, 0, 0, 1, 0, 0, 1, 1),
-(184204, 548, 1, 26.198, -654.59, 15.5, 3.14159, 0, 0, 1, 0, 0, 1, 1),
-(184205, 548, 1, 26.198, -654.59, 15.5, 3.14159, 0, 0, 1, 0, 0, 1, 1);
\ No newline at end of file
+UPDATE `gameobject_template` SET `faction`=1375 WHERE `entry` IN (184203, 184204, 184205);
+UPDATE `gameobject_template` SET `Scriptname`='go_bridge_console' WHERE entry=184568;
diff --git a/sql/updates/480_world_scripts.sql b/sql/updates/480_world_scripts.sql
index e8824571d9e..203196a0f16 100644
--- a/sql/updates/480_world_scripts.sql
+++ b/sql/updates/480_world_scripts.sql
@@ -1,2 +1,2 @@
-UPDATE creature_template SET scriptname='npc_winter_reveler' WHERE entry=15760;
-UPDATE creature_template SET scriptname='npc_brewfest_reveler' WHERE entry=24484;
\ No newline at end of file
+UPDATE `creature_template` SET `ScriptName`='npc_winter_reveler' WHERE `entry`=15760;
+UPDATE `creature_template` SET `ScriptName`='npc_brewfest_reveler' WHERE `entry`=24484;
diff --git a/sql/updates/488_world_script.sql b/sql/updates/488_world_script.sql
deleted file mode 100644
index 68e2735a7e5..00000000000
--- a/sql/updates/488_world_script.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=467;
-UPDATE `creature_template` SET `ScriptName`='npc_torek' WHERE `entry`=12858;
-UPDATE `creature_template` SET `ScriptName`='npc_magwin' WHERE `entry`=17312;
-UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry`=16993;
-UPDATE `creature_template` SET `ScriptName`='mob_abyssal' WHERE `entry`=17454;
-UPDATE `creature_template` SET `ScriptName`='mob_scarlet_trainee' WHERE `entry`=6575;
-UPDATE `instance_template` SET `script`='instance_scarlet_monastery' WHERE `map`=189;
-UPDATE `creature_template` SET `ScriptName`='mob_phoenix_tk' WHERE `entry`=21362;
-UPDATE `creature_template` SET `ScriptName`='mob_phoenix_egg_tk' WHERE `entry`=21364;
-UPDATE `creature_template` SET `ScriptName`='npc_highlord_demitrian' WHERE `entry`=14347;
-UPDATE `gameobject_template` SET `ScriptName`='go_gauntlet_gate' WHERE `entry`=175357;
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=11197;
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=10399;
-UPDATE `gameobject_template` SET `ScriptName`='go_barrel_old_hillsbrad' WHERE `entry`=182589;
-UPDATE `instance_template` SET `script`='instance_deadmines' WHERE `map`=36;
-UPDATE `gameobject_template` SET `ScriptName`='go_defias_cannon' WHERE `entry`=16398;
-UPDATE `gameobject_template` SET `ScriptName`='go_door_lever_dm' WHERE `entry`=101833;
-UPDATE `gameobject_template` SET `ScriptName`='go_main_chambers_access_panel' WHERE `entry` IN (184125,184126);
-UPDATE `creature_template` SET `ScriptName`='npc_twiggy_flathead' WHERE `entry`=6248;
-DELETE FROM `areatrigger_scripts` WHERE `entry`=522;
-INSERT INTO `areatrigger_scripts` VALUES (522,'at_twiggy_flathead');
\ No newline at end of file
diff --git a/sql/updates/488_trinity_script_text.sql b/sql/updates/488_world_scripts.sql
index d1358266782..41b264fb217 100644
--- a/sql/updates/488_trinity_script_text.sql
+++ b/sql/updates/488_world_scripts.sql
@@ -1,4 +1,26 @@
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1565019 AND -1565000;
+UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=467;
+UPDATE `creature_template` SET `ScriptName`='npc_torek' WHERE `entry`=12858;
+UPDATE `creature_template` SET `ScriptName`='npc_magwin' WHERE `entry`=17312;
+UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry`=16993;
+UPDATE `creature_template` SET `ScriptName`='mob_abyssal' WHERE `entry`=17454;
+UPDATE `creature_template` SET `ScriptName`='mob_scarlet_trainee' WHERE `entry`=6575;
+UPDATE `instance_template` SET `script`='instance_scarlet_monastery' WHERE `map`=189;
+UPDATE `creature_template` SET `ScriptName`='mob_phoenix_tk' WHERE `entry`=21362;
+UPDATE `creature_template` SET `ScriptName`='mob_phoenix_egg_tk' WHERE `entry`=21364;
+UPDATE `creature_template` SET `ScriptName`='npc_highlord_demitrian' WHERE `entry`=14347;
+UPDATE `gameobject_template` SET `ScriptName`='go_gauntlet_gate' WHERE `entry`=175357;
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=11197;
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=10399;
+UPDATE `gameobject_template` SET `ScriptName`='go_barrel_old_hillsbrad' WHERE `entry`=182589;
+UPDATE `instance_template` SET `script`='instance_deadmines' WHERE `map`=36;
+UPDATE `gameobject_template` SET `ScriptName`='go_defias_cannon' WHERE `entry`=16398;
+UPDATE `gameobject_template` SET `ScriptName`='go_door_lever_dm' WHERE `entry`=101833;
+UPDATE `gameobject_template` SET `ScriptName`='go_main_chambers_access_panel' WHERE `entry` IN (184125,184126);
+UPDATE `creature_template` SET `ScriptName`='npc_twiggy_flathead' WHERE `entry`=6248;
+DELETE FROM `areatrigger_scripts` WHERE `entry`=522;
+INSERT INTO `areatrigger_scripts` VALUES (522,'at_twiggy_flathead');DELETE FROM `script_texts` WHERE `entry` BETWEEN -1565019 AND -1565000;
+
+-- text
 INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
 (-1565000,'Gronn are the real power in outland.',11367,1,0,'maulgar SAY_AGGRO'),
 (-1565001,'You will not defeat the hand of Gruul!',11368,1,0,'maulgar SAY_ENRAGE'),
@@ -710,4 +732,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1000124, 'The Affray has begun. $n, get ready to fight!', 0, 0, 0, 'twiggy SAY_TWIGGY_BEGIN'),
 (-1000125, 'You! Enter the fray!', 0, 0, 0, 'twiggy SAY_TWIGGY_FRAY'),
 (-1000126, 'Challenger is down!', 0, 0, 0, 'twiggy SAY_TWIGGY_DOWN'),
-(-1000127, 'The Affray is over.', 0, 0, 0, 'twiggy SAY_TWIGGY_OVER');
\ No newline at end of file
+(-1000127, 'The Affray is over.', 0, 0, 0, 'twiggy SAY_TWIGGY_OVER');
diff --git a/sql/updates/502_trinity_scripts.sql b/sql/updates/502_trinity_scripts.sql
deleted file mode 100644
index 9e7e98148ab..00000000000
--- a/sql/updates/502_trinity_scripts.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE creature_template SET minhealth=2655000, maxhealth=2655000, ScriptName = 'boss_the_lurker_below', InhabitType = '3' WHERE entry = '21217';
-
-UPDATE creature_template SET ScriptName = 'mob_coilfang_ambusher' WHERE entry = '21865';
-UPDATE creature_template SET ScriptName = 'mob_coilfang_guardian' WHERE entry = '21873';
-
-UPDATE creature_model_info SET bounding_radius = '13', combat_reach = '20' WHERE modelid = '20216';
\ No newline at end of file
diff --git a/sql/updates/502_world_scripts.sql b/sql/updates/502_world_scripts.sql
new file mode 100644
index 00000000000..458d8bb24ed
--- /dev/null
+++ b/sql/updates/502_world_scripts.sql
@@ -0,0 +1,6 @@
+UPDATE `creature_template` SET `minhealth`=2655000, `maxhealth`=2655000, `ScriptName` = 'boss_the_lurker_below', `InhabitType` = '3' WHERE `entry` = '21217';
+
+UPDATE `creature_template` SET `ScriptName` = 'mob_coilfang_ambusher' WHERE `entry` = '21865';
+UPDATE `creature_template` SET `ScriptName` = 'mob_coilfang_guardian' WHERE `entry` = '21873';
+
+UPDATE `creature_model_info` SET `bounding_radius` = '13', `combat_reach` = '20' WHERE `modelid` = '20216';
diff --git a/sql/updates/513_world_scripts.sql b/sql/updates/513_world_scripts.sql
index d70ff7dbe59..21a57ea3316 100644
--- a/sql/updates/513_world_scripts.sql
+++ b/sql/updates/513_world_scripts.sql
@@ -1,6 +1,3 @@
-DELETE FROM gameobject WHERE id=184956;
-INSERT INTO gameobject (id, map, spawnMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES (184956, 548, 1, 39.1372, -418.625, -21.5806, 1.29069, 0, 0, 0.601475, 0.798891, 25, 0, 1);
-
 UPDATE `instance_template` SET `script`='instance_dark_portal' WHERE `map`=269;
 UPDATE `creature_template` SET `ScriptName`='npc_medivh_bm' WHERE `entry`=15608;
 UPDATE `creature_template` SET `ScriptName`='npc_time_rift' WHERE `entry`=17838;
@@ -19,4 +16,4 @@ INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,
 (-1269025,'No... damn this feeble mortal coil...',10441,1,0,'medivh SAY_DEATH'),
 (-1269026,'I am grateful for your aid, champions. Now, Gul\'dan\'s Horde will sweep across this world, like a locust swarm, and all my designs, all my carefully laid plans will at last fall into place.',10440,1,0,'medivh SAY_WIN'),
 (-1269027,'Orcs of the Horde! This portalis the gateway to your new destiny! Azeroth lies before you, ripe for the taking!',0,1,0,'medivh SAY_ORCS_ENTER'),
-(-1269028,'Gul\'dan speaks the truth! We should return at once to tell our brothers of the news! Retreat back trought the portal!',0,1,0,'medivh SAY_ORCS_ANSWER');
\ No newline at end of file
+(-1269028,'Gul\'dan speaks the truth! We should return at once to tell our brothers of the news! Retreat back trought the portal!',0,1,0,'medivh SAY_ORCS_ANSWER');
diff --git a/sql/updates/566_world_spell_script_target.sql b/sql/updates/566_world.sql
index 6c176e1ad89..6c176e1ad89 100644
--- a/sql/updates/566_world_spell_script_target.sql
+++ b/sql/updates/566_world.sql
diff --git a/sql/updates/572_world.sql b/sql/updates/572_world.sql
index e92604fa832..33ce446b012 100644
--- a/sql/updates/572_world.sql
+++ b/sql/updates/572_world.sql
@@ -4,4 +4,4 @@ UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=
 DELETE FROM `script_texts` WHERE `entry` IN (-1000138,-1000139);
 INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
 (-1000138, 'Avruu\'s magic... it still controls me. You must fight me, mortal. It\'s the only way to break the spell!', 0, 0, 0, 'aeranas SAY_SUMMON'),
-(-1000139, 'Avruu\'s magic is broken! I\'m free once again!', 0, 0, 0, 'aeranas SAY_FREE');
\ No newline at end of file
+(-1000139, 'Avruu\'s magic is broken! I\'m free once again!', 0, 0, 0, 'aeranas SAY_FREE');
diff --git a/sql/updates/575_world_scripts.sql b/sql/updates/575_world_scripts.sql
index cb88d829ca1..85a75215f0e 100644
--- a/sql/updates/575_world_scripts.sql
+++ b/sql/updates/575_world_scripts.sql
@@ -1 +1 @@
-UPDATE `item_template` SET `scriptname` = "item_only_for_flight" WHERE `entry` IN (34475, 34489, 24538);
\ No newline at end of file
+UPDATE `item_template` SET `ScriptName` = "item_only_for_flight" WHERE `entry` IN (34475, 34489, 24538);
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 1f3e4e120f9..d2d2bbafe4e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -13717,6 +13717,11 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
         uint32 personal_rating = fields[3].GetUInt32();
 
         ArenaTeam* aTeam = objmgr.GetArenaTeamById(arenateamid);
+        if(!aTeam)
+        {
+            sLog.outError("FATAL: couldn't load arenateam %u", arenateamid);
+            continue;
+        }
         uint8  arenaSlot = aTeam->GetSlot();
 
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6]     = arenateamid;      // TeamID