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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/MailHandler.cpp

20 files changed, 442 insertions, 0 deletions

diff --git a/sql/updates/auth/2013_02_25_00_auth_misc.sql b/sql/updates/auth/2013_02_25_00_auth_misc.sql
new file mode 100644
index 00000000000..5531252037a
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_00_auth_misc.sql
@@ -0,0 +1,18 @@
+-- Add new permission
+DELETE FROM `rbac_permissions` WHERE `id` = 11;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (11, 'Log GM trades');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 8;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (8, 'Log GM trades');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 8;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (8, 11);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 8;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 8),
+(3, 8),
+(4, 8);
diff --git a/sql/updates/auth/2013_02_25_01_auth_misc.sql b/sql/updates/auth/2013_02_25_01_auth_misc.sql
new file mode 100644
index 00000000000..f5cb6c01d19
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_01_auth_misc.sql
@@ -0,0 +1,18 @@
+-- Add new permission
+DELETE FROM `rbac_permissions` WHERE `id` = 13;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (13, 'Skip Instance required bosses check');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 9;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (9, 'Skip Instance required bosses check');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 9;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (9, 13);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 9;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 9),
+(3, 9),
+(4, 9);
diff --git a/sql/updates/auth/2013_02_25_02_auth_misc.sql b/sql/updates/auth/2013_02_25_02_auth_misc.sql
new file mode 100644
index 00000000000..11e235c91d9
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_02_auth_misc.sql
@@ -0,0 +1,18 @@
+-- Add new permission
+DELETE FROM `rbac_permissions` WHERE `id` = 32;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (32, 'Can be assigned tickets with .assign ticket command');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 10;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (10, 'Ticket management');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 10;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (10, 32);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 10;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 10),
+(3, 10),
+(4, 10);
diff --git a/sql/updates/auth/2013_02_25_03_auth_misc.sql b/sql/updates/auth/2013_02_25_03_auth_misc.sql
new file mode 100644
index 00000000000..ab2c6e0692c
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_03_auth_misc.sql
@@ -0,0 +1,33 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (30, 31, 38);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(30, 'Save character without delay with .save command'),
+(31, 'Use params with .unstuck command'),
+(38, 'Resurrect with full Health Points');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (11, 12, 13);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(11, 'Instant .save'),
+(12, 'Allow params with .unstuck'),
+(13, 'Full HP after resurrect');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (11, 12, 13);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(11, 30),
+(12, 31),
+(13, 38);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (11, 12, 13);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 11),
+(3, 11),
+(4, 11),
+(2, 12),
+(3, 12),
+(4, 12),
+(2, 13),
+(3, 13),
+(4, 13);
diff --git a/sql/updates/auth/2013_02_25_04_auth_misc.sql b/sql/updates/auth/2013_02_25_04_auth_misc.sql
new file mode 100644
index 00000000000..faaee3582ea
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_04_auth_misc.sql
@@ -0,0 +1,27 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (34, 37);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(34, 'Check if should appear in list using .gm ingame command'),
+(37, 'Use staff badge in chat');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (14, 15);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(14, 'Appear in GM ingame list'),
+(15, 'Use staff badge in chat');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (14, 15);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(14, 34),
+(15, 37);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (14, 15);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 14),
+(3, 14),
+(4, 14),
+(2, 15),
+(3, 15),
+(4, 15);
diff --git a/sql/updates/auth/2013_02_25_05_auth_misc.sql b/sql/updates/auth/2013_02_25_05_auth_misc.sql
new file mode 100644
index 00000000000..e3ee3f00572
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_05_auth_misc.sql
@@ -0,0 +1,18 @@
+-- Add new permission
+DELETE FROM `rbac_permissions` WHERE `id` = 44;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (44, 'Receive global GM messages/texts');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 16;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (16, 'Receive global GM messages/texts');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 16;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (16, 44);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 16;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 16),
+(3, 16),
+(4, 16);
diff --git a/sql/updates/auth/2013_02_25_06_auth_misc.sql b/sql/updates/auth/2013_02_25_06_auth_misc.sql
new file mode 100644
index 00000000000..92eae3d782d
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_06_auth_misc.sql
@@ -0,0 +1,18 @@
+-- Add new permission
+DELETE FROM `rbac_permissions` WHERE `id` = 23;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (23, 'Skip over-speed ping check');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 17;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (17, 'Skip over-speed ping check');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 17;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (17, 23);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 17;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 17),
+(3, 17),
+(4, 17);
diff --git a/sql/updates/auth/2013_02_25_07_auth_misc.sql b/sql/updates/auth/2013_02_25_07_auth_misc.sql
new file mode 100644
index 00000000000..2416f08280c
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_07_auth_misc.sql
@@ -0,0 +1,21 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (42, 43);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(42, 'Allows to use CMSG_WORLD_TELEPORT opcode'),
+(43, 'Allows to use CMSG_WHOIS opcode');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 18;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(18, 'Allows Admin Opcodes');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 18;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(18, 42),
+(18, 43);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 18;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(4, 18);
diff --git a/sql/updates/auth/2013_02_25_08_auth_misc.sql b/sql/updates/auth/2013_02_25_08_auth_misc.sql
new file mode 100644
index 00000000000..244b1848d0c
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_08_auth_misc.sql
@@ -0,0 +1,19 @@
+-- Add new permission
+DELETE FROM `rbac_permissions` WHERE `id` = 27;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (27, 'Two side mail interaction');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` = 19;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (19, 'Two side mail interaction');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 19;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (19, 27);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 19;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(1, 19),
+(2, 19),
+(3, 19),
+(4, 19);
diff --git a/sql/updates/auth/2013_02_25_09_auth_misc.sql b/sql/updates/auth/2013_02_25_09_auth_misc.sql
new file mode 100644
index 00000000000..f2affe05b70
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_09_auth_misc.sql
@@ -0,0 +1,27 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (33, 47);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(33, 'Notify if a command was not found'),
+(47, 'Enables lower security than target check');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (20, 21);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(20, 'Notify if a command was not found'),
+(21, 'Enables lower security than target check');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (20, 21);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(20, 33),
+(21, 47);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (20, 21);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 20),
+(3, 20),
+(4, 20),
+(2, 21),
+(3, 21),
+(4, 21);
diff --git a/sql/updates/auth/2013_02_25_10_auth_misc.sql b/sql/updates/auth/2013_02_25_10_auth_misc.sql
new file mode 100644
index 00000000000..4255bdac8ba
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_10_auth_misc.sql
@@ -0,0 +1,43 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (20, 21, 22, 39, 41);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(20, 'Skip disable map check'),
+(21, 'Skip reset talents when used more than allowed check'),
+(22, 'Skip spam chat check'),
+(39, 'Restore saved gm setting states'),
+(41, 'Use Config option START_GM_LEVEL to assign new character level');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (22, 23, 24, 25, 26);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(22, 'Skip disable map check'),
+(23, 'Skip reset talents when used more than allowed check'),
+(24, 'Skip spam chat check'),
+(25, 'Restore saved gm setting states'),
+(26, 'Use Config option START_GM_LEVEL to assign new character level');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (22, 23, 24, 25, 26);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(22, 20),
+(23, 21),
+(24, 22),
+(25, 39),
+(26, 41);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (22, 23, 24, 25, 26);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 22),
+(3, 22),
+(4, 22),
+(4, 23),
+(2, 24),
+(3, 24),
+(4, 24),
+(2, 25),
+(3, 25),
+(4, 25),
+(2, 26),
+(3, 26),
+(4, 26);
diff --git a/sql/updates/auth/2013_02_25_11_auth_misc.sql b/sql/updates/auth/2013_02_25_11_auth_misc.sql
new file mode 100644
index 00000000000..9c2897394e5
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_11_auth_misc.sql
@@ -0,0 +1,34 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (19, 25, 36);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(19, 'Skips needed requirements to use channel check'),
+(25, 'Allow say chat between factions'),
+(36, 'Filter whispers');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (27, 28, 29);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(27, 'Skips needed requirements to use channel check'),
+(28, 'Allow say chat between factions'),
+(29, 'Filter whispers');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (27, 28, 29);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(27, 19),
+(28, 25),
+(29, 36);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (27, 28, 29);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 27),
+(3, 27),
+(4, 27),
+(1, 28),
+(2, 28),
+(3, 28),
+(4, 28),
+(2, 29),
+(3, 29),
+(4, 29);
diff --git a/sql/updates/auth/2013_02_25_12_auth_misc.sql b/sql/updates/auth/2013_02_25_12_auth_misc.sql
new file mode 100644
index 00000000000..2b394dc9bcb
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_12_auth_misc.sql
@@ -0,0 +1,34 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (26, 45, 46);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(26, 'Allow channel chat between factions'),
+(45, 'Join channels without announce'),
+(46, 'Change channel settings without being channel moderator');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (30, 31, 32);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(30, 'Allow channel chat between factions'),
+(31, 'Join channels without announce'),
+(32, 'Change channel settings without being channel moderator');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (30, 31, 32);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(30, 26),
+(31, 45),
+(32, 46);
+
+-- Add it to all GM+ groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (30, 31, 32);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(1, 30),
+(2, 30),
+(3, 30),
+(4, 30),
+(2, 31),
+(3, 31),
+(4, 31),
+(2, 32),
+(3, 32),
+(4, 32);
diff --git a/sql/updates/auth/2013_02_25_13_auth_misc.sql b/sql/updates/auth/2013_02_25_13_auth_misc.sql
new file mode 100644
index 00000000000..82247ecd07d
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_13_auth_misc.sql
@@ -0,0 +1,36 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (14, 15, 16, 17, 18, 24);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(14, 'Skips character creation team mask check'),
+(15, 'Skips character creation class mask check'),
+(16, 'Skips character creation race mask check'),
+(17, 'Skips character creation reserved name check'),
+(18, 'Skips character creation heroic min level check'),
+(24, 'Creation of two side faction characters in same account');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (33, 34);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(33, 'Skips character creation checks'),
+(34, 'Creation of two side faction characters in same account');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (33, 34);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(33, 14),
+(33, 15),
+(33, 16),
+(33, 17),
+(33, 18),
+(34, 24);
+
+-- Add it to all groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (33, 34);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 33),
+(3, 33),
+(4, 33),
+(2, 34),
+(3, 34),
+(4, 34);
+
diff --git a/sql/updates/auth/2013_02_25_14_auth_misc.sql b/sql/updates/auth/2013_02_25_14_auth_misc.sql
new file mode 100644
index 00000000000..c02b600b12f
--- /dev/null
+++ b/sql/updates/auth/2013_02_25_14_auth_misc.sql
@@ -0,0 +1,39 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` IN (28, 29, 35, 40);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(28, 'See two side who list'),
+(29, 'Add friends of other faction'),
+(35, 'See all security levels with who command'),
+(40, 'Allows to add a gm to friend list');
+
+-- Add new role
+DELETE FROM `rbac_roles` WHERE `id` IN (33, 34);
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES
+(35, 'See two side who list'),
+(36, 'Add friends of other faction'),
+(37, 'See all security levels with who command'),
+(38, 'Allows to add a gm to friend list');
+
+-- Add the permission to the role
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (35, 36, 37, 38);
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(35, 28),
+(36, 29),
+(37, 35),
+(38, 40);
+
+-- Add it to all groups
+DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (35, 36, 37, 38);
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
+(2, 35),
+(3, 35),
+(4, 35),
+(2, 36),
+(3, 36),
+(4, 36),
+(2, 37),
+(3, 37),
+(4, 37),
+(2, 38),
+(3, 38),
+(4, 38);
diff --git a/sql/updates/world/2013_02_24_00_world_creature_summon_groups.sql b/sql/updates/world/2013_02_24_00_world_creature_summon_groups.sql
new file mode 100644
index 00000000000..409f79bb2aa
--- /dev/null
+++ b/sql/updates/world/2013_02_24_00_world_creature_summon_groups.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS `creature_summon_groups`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_summon_groups` (
+  `summonerId` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `summonerType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `groupId` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `position_x` float NOT NULL DEFAULT '0',
+  `position_y` float NOT NULL DEFAULT '0',
+  `position_z` float NOT NULL DEFAULT '0',
+  `orientation` float NOT NULL DEFAULT '0',
+  `summonType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `summonTime` int(10) unsigned NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/sql/updates/world/2013_02_24_01_world_areatrigger_scripts.sql b/sql/updates/world/2013_02_24_01_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..2aebe1d2edd
--- /dev/null
+++ b/sql/updates/world/2013_02_24_01_world_areatrigger_scripts.sql
@@ -0,0 +1,3 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry`=5173;
+INSERT INTO `areatrigger_scripts`(`entry`,`ScriptName`) VALUE
+(5173,'at_frostgrips_hollow');
diff --git a/sql/updates/world/2013_02_24_02_world_smart_scripts.sql b/sql/updates/world/2013_02_24_02_world_smart_scripts.sql
new file mode 100644
index 00000000000..7b41c82b6fa
--- /dev/null
+++ b/sql/updates/world/2013_02_24_02_world_smart_scripts.sql
@@ -0,0 +1,7 @@
+DELETE FROM `smart_scripts` WHERE `entryorguid`=29861 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`source_type`,`event_type`,`action_type`,`action_param1`,`action_param2`,`target_type`,`comment`) VALUES
+(29861,0,54,80,2986100,2,1,'Stormforged Eradictor - Just summoned - Call timed actionlist 2986100');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2986100 AND `source_type`=9;
+INSERT INTO `smart_scripts`(`entryorguid`,`source_type`,`id`,`event_param1`,`event_param2`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`target_type`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUE
+(2986100,9,0,10000,10000,12,29729,4,10000,8,6972.13,14.24,805.79,3.349,'Stormforged Eradictor - Timed actionlist - Summon Frostborn Axemaster');
diff --git a/sql/updates/world/2013_02_24_03_world_waypoint_data.sql b/sql/updates/world/2013_02_24_03_world_waypoint_data.sql
new file mode 100644
index 00000000000..e97f0758304
--- /dev/null
+++ b/sql/updates/world/2013_02_24_03_world_waypoint_data.sql
@@ -0,0 +1,11 @@
+DELETE FROM `waypoint_data` WHERE `id`=2986200;
+INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(2986200,0,6963.95,45.65,818.71),
+(2986200,1,6965.09,39.67,820.15),
+(2986200,2,6963.56,21.14,805.79);
+
+DELETE FROM `waypoint_data` WHERE `id`=2986100;
+INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+(2986100,0,6983.18,7.150,806.33),
+(2986100,1,6975.37,16.73,804.98),
+(2986100,2,6967.15,13.27,806.56);
diff --git a/sql/updates/world/2013_02_24_04_world_creature_template.sql b/sql/updates/world/2013_02_24_04_world_creature_template.sql
new file mode 100644
index 00000000000..c9acc0d2a1a
--- /dev/null
+++ b/sql/updates/world/2013_02_24_04_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `faction_A`=1954,`faction_H`=1954,`AIName`='SmartAI' WHERE `entry`=29861;
+UPDATE `creature_template` SET `faction_A`=1954,`faction_H`=1954 WHERE `entry`=29862;