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

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/server/worldserver/worldserver.conf.dist

12 files changed, 249 insertions, 0 deletions

diff --git a/sql/updates/auth/2013_08_30_00_auth_misc.sql b/sql/updates/auth/2013_08_30_00_auth_misc.sql
new file mode 100644
index 00000000000..1e790ce7e28
--- /dev/null
+++ b/sql/updates/auth/2013_08_30_00_auth_misc.sql
@@ -0,0 +1,41 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN 200 AND 216;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(200, 'Command: .rbac'),
+(201, 'Command: .rbac account'),
+(202, 'Command: .rbac account group'),
+(203, 'Command: .rbac account group add'),
+(204, 'Command: .rbac account group remove'),
+(205, 'Command: .rbac account role'),
+(206, 'Command: .rbac account role grant'),
+(207, 'Command: .rbac account role deny'),
+(208, 'Command: .rbac account role revoke'),
+(209, 'Command: .rbac account permission'),
+(210, 'Command: .rbac account permission grant'),
+(211, 'Command: .rbac account permission deny'),
+(212, 'Command: .rbac account permission revoke'),
+(213, 'Command: .rbac list'),
+(214, 'Command: .rbac list groups'),
+(215, 'Command: .rbac list roles'),
+(216, 'Command: .rbac list permissions');
+
+-- Add Permissions to "Administrator Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 4 AND `permissionId` BETWEEN 200 AND 216;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(4, 200),
+(4, 201),
+(4, 202),
+(4, 203),
+(4, 204),
+(4, 205),
+(4, 206),
+(4, 207),
+(4, 208),
+(4, 209),
+(4, 210),
+(4, 211),
+(4, 212),
+(4, 213),
+(4, 214),
+(4, 215),
+(4, 216);
diff --git a/sql/updates/auth/2013_08_30_01_auth_misc.sql b/sql/updates/auth/2013_08_30_01_auth_misc.sql
new file mode 100644
index 00000000000..096588ba2ab
--- /dev/null
+++ b/sql/updates/auth/2013_08_30_01_auth_misc.sql
@@ -0,0 +1,28 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN 217 AND 229;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(217, 'Command: .account'),
+(218, 'Command: .account addon'),
+(219, 'Command: .account create'),
+(220, 'Command: .account delete'),
+(221, 'Command: .account lock'),
+(222, 'Command: .account lock country'),
+(223, 'Command: .account lock ip'),
+(224, 'Command: .account onlinelist'),
+(225, 'Command: .account password'),
+(226, 'Command: .account set'),
+(227, 'Command: .account set addon'),
+(228, 'Command: .account set gmlevel'),
+(229, 'Command: .account set password');
+
+-- Add Permissions to "corresponding Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN 217 AND 229;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(1, 217),
+(2, 218),
+(1, 221),
+(1, 222),
+(1, 223),
+(1, 225),
+(4, 226),
+(4, 227);
diff --git a/sql/updates/auth/2013_08_30_02_auth_misc.sql b/sql/updates/auth/2013_08_30_02_auth_misc.sql
new file mode 100644
index 00000000000..da5f187627b
--- /dev/null
+++ b/sql/updates/auth/2013_08_30_02_auth_misc.sql
@@ -0,0 +1,25 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN 230 AND 238;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(230, 'achievement'),
+(231, 'achievement add'),
+(232, 'arena'),
+(233, 'arena captain'),
+(234, 'arena create'),
+(235, 'arena disband'),
+(236, 'arena info'),
+(237, 'arena lookup'),
+(238, 'arena rename');
+
+-- Add Permissions to "corresponding Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN 230 AND 238;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(4, 230),
+(4, 231),
+(3, 232),
+(4, 233),
+(4, 234),
+(4, 235),
+(3, 236),
+(3, 237),
+(4, 238);
diff --git a/sql/updates/auth/2013_08_30_03_auth_misc.sql b/sql/updates/auth/2013_08_30_03_auth_misc.sql
new file mode 100644
index 00000000000..a6495a2de6e
--- /dev/null
+++ b/sql/updates/auth/2013_08_30_03_auth_misc.sql
@@ -0,0 +1,43 @@
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN 239 AND 256;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(239, 'ban'),
+(240, 'ban account'),
+(241, 'ban character'),
+(242, 'ban ip'),
+(243, 'ban playeraccount'),
+(244, 'baninfo'),
+(245, 'baninfo account'),
+(246, 'baninfo character'),
+(247, 'baninfo ip'),
+(248, 'banlist'),
+(249, 'banlist account'),
+(250, 'banlist character'),
+(251, 'banlist ip'),
+(252, 'unban'),
+(253, 'unban account'),
+(254, 'unban character'),
+(255, 'unban ip'),
+(256, 'unban playeraccount');
+
+-- Add Permissions to "corresponding Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN 239 AND 256;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(4, 239),
+(4, 240),
+(4, 241),
+(4, 242),
+(4, 243),
+(4, 244),
+(4, 245),
+(4, 246),
+(4, 247),
+(4, 248),
+(4, 249),
+(4, 250),
+(4, 251),
+(4, 252),
+(4, 253),
+(4, 254),
+(4, 255),
+(4, 256);
diff --git a/sql/updates/world/2013_08_30_00_world_gameobject_loot_template.sql b/sql/updates/world/2013_08_30_00_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..3e6ed052f34
--- /dev/null
+++ b/sql/updates/world/2013_08_30_00_world_gameobject_loot_template.sql
@@ -0,0 +1 @@
+UPDATE `gameobject_loot_template` SET `item`=33700 WHERE  `entry`=24157 AND `item`=37703;
diff --git a/sql/updates/world/2013_08_30_01_world_command.sql b/sql/updates/world/2013_08_30_01_world_command.sql
new file mode 100644
index 00000000000..e786c85a118
--- /dev/null
+++ b/sql/updates/world/2013_08_30_01_world_command.sql
@@ -0,0 +1,12 @@
+ALTER TABLE `command` CHANGE `security` `permission` SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL;
+
+-- Player commands
+UPDATE `command` SET `permission` = 7 WHERE `permission` = 0;
+-- Moderator commands
+UPDATE `command` SET `permission` = 8 WHERE `permission` = 1;
+-- GM commands
+UPDATE `command` SET `permission` = 9 WHERE `permission` = 2;
+-- administrator commands
+UPDATE `command` SET `permission` = 10 WHERE `permission` = 3;
+-- console commands
+UPDATE `command` SET `permission` = 12 WHERE `permission` = 4;
diff --git a/sql/updates/world/2013_08_30_02_world_command.sql b/sql/updates/world/2013_08_30_02_world_command.sql
new file mode 100644
index 00000000000..7cf91342101
--- /dev/null
+++ b/sql/updates/world/2013_08_30_02_world_command.sql
@@ -0,0 +1,16 @@
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = 201 WHERE `name` = '.rbac account';
+UPDATE `command` SET `permission` = 202 WHERE `name` = '.rbac account group';
+UPDATE `command` SET `permission` = 203 WHERE `name` = '.rbac account group add';
+UPDATE `command` SET `permission` = 204 WHERE `name` = '.rbac account group remove';
+UPDATE `command` SET `permission` = 205 WHERE `name` = '.rbac account role';
+UPDATE `command` SET `permission` = 206 WHERE `name` = '.rbac account role grant';
+UPDATE `command` SET `permission` = 207 WHERE `name` = '.rbac account role deny';
+UPDATE `command` SET `permission` = 208 WHERE `name` = '.rbac account role revoke';
+UPDATE `command` SET `permission` = 209 WHERE `name` = '.rbac account permission';
+UPDATE `command` SET `permission` = 210 WHERE `name` = '.rbac account permission grant';
+UPDATE `command` SET `permission` = 211 WHERE `name` = '.rbac account permission deny';
+UPDATE `command` SET `permission` = 212 WHERE `name` = '.rbac account permission revoke';
+UPDATE `command` SET `permission` = 214 WHERE `name` = '.rbac account list groups';
+UPDATE `command` SET `permission` = 215 WHERE `name` = '.rbac account list roles';
+UPDATE `command` SET `permission` = 216 WHERE `name` = '.rbac account list permissions';
diff --git a/sql/updates/world/2013_08_30_03_world_command.sql b/sql/updates/world/2013_08_30_03_world_command.sql
new file mode 100644
index 00000000000..d7e11b45aed
--- /dev/null
+++ b/sql/updates/world/2013_08_30_03_world_command.sql
@@ -0,0 +1,15 @@
+UPDATE `command` SET `name` = 'rbac account' WHERE `name` = '.rbac account';
+UPDATE `command` SET `name` = 'rbac account group' WHERE `name` = '.rbac account group';
+UPDATE `command` SET `name` = 'rbac account group add' WHERE `name` = '.rbac account group add';
+UPDATE `command` SET `name` = 'rbac account group remove' WHERE `name` = '.rbac account group remove';
+UPDATE `command` SET `name` = 'rbac account role' WHERE `name` = '.rbac account role';
+UPDATE `command` SET `name` = 'rbac account role grant' WHERE `name` = '.rbac account role grant';
+UPDATE `command` SET `name` = 'rbac account role deny' WHERE `name` = '.rbac account role deny';
+UPDATE `command` SET `name` = 'rbac account role revoke' WHERE `name` = '.rbac account role revoke';
+UPDATE `command` SET `name` = 'rbac account permission' WHERE `name` = '.rbac account permission';
+UPDATE `command` SET `name` = 'rbac account permission grant' WHERE `name` = '.rbac account permission grant';
+UPDATE `command` SET `name` = 'rbac account permission deny' WHERE `name` = '.rbac account permission deny';
+UPDATE `command` SET `name` = 'rbac account permission revoke' WHERE `name` = '.rbac account permission revoke';
+UPDATE `command` SET `name` = 'rbac account list groups' WHERE `name` = '.rbac account list groups';
+UPDATE `command` SET `name` = 'rbac account list roles' WHERE `name` = '.rbac account list roles';
+UPDATE `command` SET `name` = 'rbac account list permissions' WHERE `name` = '.rbac account list permissions';
diff --git a/sql/updates/world/2013_08_30_04_world_command.sql b/sql/updates/world/2013_08_30_04_world_command.sql
new file mode 100644
index 00000000000..c77f651f9e5
--- /dev/null
+++ b/sql/updates/world/2013_08_30_04_world_command.sql
@@ -0,0 +1,14 @@
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = 217 WHERE `name` = 'account';
+UPDATE `command` SET `permission` = 218 WHERE `name` = 'account addon';
+UPDATE `command` SET `permission` = 219 WHERE `name` = 'account create';
+UPDATE `command` SET `permission` = 220 WHERE `name` = 'account delete';
+UPDATE `command` SET `permission` = 221 WHERE `name` = 'account lock';
+UPDATE `command` SET `permission` = 222 WHERE `name` = 'account lock country';
+UPDATE `command` SET `permission` = 223 WHERE `name` = 'account lock ip';
+UPDATE `command` SET `permission` = 224 WHERE `name` = 'account onlinelist';
+UPDATE `command` SET `permission` = 225 WHERE `name` = 'account password';
+UPDATE `command` SET `permission` = 226 WHERE `name` = 'account set';
+UPDATE `command` SET `permission` = 227 WHERE `name` = 'account set addon';
+UPDATE `command` SET `permission` = 228 WHERE `name` = 'account set gmlevel';
+UPDATE `command` SET `permission` = 229 WHERE `name` = 'account set password';
diff --git a/sql/updates/world/2013_08_30_05_world_command.sql b/sql/updates/world/2013_08_30_05_world_command.sql
new file mode 100644
index 00000000000..017ab4fa03e
--- /dev/null
+++ b/sql/updates/world/2013_08_30_05_world_command.sql
@@ -0,0 +1,10 @@
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = 230 WHERE `name` = 'achievement';
+UPDATE `command` SET `permission` = 231 WHERE `name` = 'achievement add';
+UPDATE `command` SET `permission` = 232 WHERE `name` = 'arena';
+UPDATE `command` SET `permission` = 233 WHERE `name` = 'arena captain';
+UPDATE `command` SET `permission` = 234 WHERE `name` = 'arena create';
+UPDATE `command` SET `permission` = 235 WHERE `name` = 'arena disband';
+UPDATE `command` SET `permission` = 236 WHERE `name` = 'arena info';
+UPDATE `command` SET `permission` = 237 WHERE `name` = 'arena lookup';
+UPDATE `command` SET `permission` = 238 WHERE `name` = 'arena rename';
diff --git a/sql/updates/world/2013_08_30_06_world_command.sql b/sql/updates/world/2013_08_30_06_world_command.sql
new file mode 100644
index 00000000000..777319613ce
--- /dev/null
+++ b/sql/updates/world/2013_08_30_06_world_command.sql
@@ -0,0 +1,19 @@
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = 239 WHERE `name` = 'ban';
+UPDATE `command` SET `permission` = 240 WHERE `name` = 'ban account';
+UPDATE `command` SET `permission` = 241 WHERE `name` = 'ban character';
+UPDATE `command` SET `permission` = 242 WHERE `name` = 'ban ip';
+UPDATE `command` SET `permission` = 243 WHERE `name` = 'ban playeraccount';
+UPDATE `command` SET `permission` = 244 WHERE `name` = 'baninfo';
+UPDATE `command` SET `permission` = 245 WHERE `name` = 'baninfo account';
+UPDATE `command` SET `permission` = 246 WHERE `name` = 'baninfo character';
+UPDATE `command` SET `permission` = 247 WHERE `name` = 'baninfo ip';
+UPDATE `command` SET `permission` = 248 WHERE `name` = 'banlist';
+UPDATE `command` SET `permission` = 249 WHERE `name` = 'banlist account';
+UPDATE `command` SET `permission` = 250 WHERE `name` = 'banlist character';
+UPDATE `command` SET `permission` = 251 WHERE `name` = 'banlist ip';
+UPDATE `command` SET `permission` = 252 WHERE `name` = 'unban';
+UPDATE `command` SET `permission` = 253 WHERE `name` = 'unban account';
+UPDATE `command` SET `permission` = 254 WHERE `name` = 'unban character';
+UPDATE `command` SET `permission` = 255 WHERE `name` = 'unban ip';
+UPDATE `command` SET `permission` = 256 WHERE `name` = 'unban playeraccount';
diff --git a/sql/updates/world/2013_08_30_06_world_eai_sai.sql b/sql/updates/world/2013_08_30_06_world_eai_sai.sql
new file mode 100644
index 00000000000..33814d2cc36
--- /dev/null
+++ b/sql/updates/world/2013_08_30_06_world_eai_sai.sql
@@ -0,0 +1,25 @@
+DELETE FROM `creature_ai_scripts` WHERE `action1_type`=27;
+
+-- INSERT INTO `creature_ai_scripts` (`id`, `creature_id`, `event_type`, `event_inverse_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action1_type`, `action1_param1`, `action1_param2`, `action1_param3`, `action2_type`, `action2_param1`, `action2_param2`, `action2_param3`, `action3_type`, `action3_param1`, `action3_param2`, `action3_param3`, `comment`) VALUES
+--   ('343001', '3430', '0', '0', '100', '0', '0', '0', '0', '0', '27', '5043', '17013', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Mangletooth - Cast Agamaggan''s Agility on Quest Complete'),
+--   ('343002', '3430', '0', '0', '100', '0', '0', '0', '0', '0', '27', '5042', '16612', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Mangletooth - Cast Agamaggan''s Strength on Quest Complete'),
+--   ('343003', '3430', '0', '0', '100', '0', '0', '0', '0', '0', '27', '5046', '16610', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Mangletooth - Cast Razorhide on Quest Complete'),
+--   ('343004', '3430', '0', '0', '100', '0', '0', '0', '0', '0', '27', '5045', '10767', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Mangletooth - Cast Rising Spirit on Quest Complete'),
+--   ('343005', '3430', '0', '0', '100', '0', '0', '0', '0', '0', '27', '889', '16618', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Mangletooth - Cast Spirit of the Wind on Quest Complete'),
+--   ('343006', '3430', '0', '0', '100', '0', '0', '0', '0', '0', '27', '5044', '7764', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'Mangletooth - Cast Wisdom of Agamaggan on Quest Complete');
+
+UPDATE `smart_scripts` SET `action_type`=33, `action_param2`=0 WHERE `source_type`=0 AND `action_type`=27; -- by VM
+
+-- all quests that used RequiredSpellCastX fields
+UPDATE `quest_template` SET `SpecialFlags`=`SpecialFlags`|32 WHERE `entry` IN
+(28,29,532,553,849,877,905,974,2118,2932,2994,3825,5096,5163,5165,5441,
+6124,6129,6381,6395,6661,8346,8889,9066,9169,9193,9275,9294,9391,9440,
+9444,9447,9489,9526,9600,9629,9667,9685,9720,9805,9824,9874,9910,10011,
+10078,10087,10129,10144,10146,10182,10208,10233,10240,10305,10306,10307,
+10313,10335,10345,10392,10426,10446,10447,10488,10545,10564,10598,10637,
+10688,10714,10771,10792,10802,10808,10813,10833,10859,10866,10895,10913,
+10923,10935,11055,11150,11205,11232,11245,11247,11258,11259,11285,11330,
+11332,11421,11496,11515,11523,11542,11543,11547,11568,11576,11582,11610,
+11617,11637,11656,11677,11684,11694,11713,11880,12092,12094,12096,12154,
+12172,12173,12180,12213,12232,12267,12417,12449,12502,12588,12591,12598,
+12641,12669,12728,12859,13110,13119,13211);