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

Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h

10 files changed, 103 insertions, 0 deletions

diff --git a/sql/updates/auth/2014_04_28_00_rbac_permissions.sql b/sql/updates/auth/2014_04_28_00_rbac_permissions.sql
new file mode 100644
index 00000000000..290052764dd
--- /dev/null
+++ b/sql/updates/auth/2014_04_28_00_rbac_permissions.sql
@@ -0,0 +1,21 @@
+DELETE FROM `rbac_permissions` WHERE `id` IN (631,632,633,634,635,636,637,638,639,640);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(633, 'Command: reload creature_linked_respawn'),
+(634, 'Command: reload creature_loot_template'),
+(635, 'Command: reload creature_onkill_reputation'),
+(636, 'Command: reload creature_questender'),
+(637, 'Command: reload creature_queststarter'),
+(638, 'Command: reload creature_summon_groups'),
+(639, 'Command: reload creature_template'),
+(640, 'Command: reload creature_text');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` IN (631,632,633,634,635,636,637,638,639,640);
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, 633),
+(196, 634),
+(196, 635),
+(196, 636),
+(196, 637),
+(196, 638),
+(196, 639),
+(196, 640);
diff --git a/sql/updates/world/2014_04_28_01_world_creature_template.sql b/sql/updates/world/2014_04_28_01_world_creature_template.sql
new file mode 100644
index 00000000000..0bdd9657c65
--- /dev/null
+++ b/sql/updates/world/2014_04_28_01_world_creature_template.sql
@@ -0,0 +1,24 @@
+UPDATE `creature_template` SET `difficulty_entry_3`=37292 WHERE `entry`=13446;
+UPDATE `creature_template` SET `difficulty_entry_3`=37276 WHERE `entry`=13153;
+UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37279;
+UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37299;
+UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37279;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37299;
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=37248;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37248;
+UPDATE `creature_template` SET `faction`=85 WHERE `entry`=37261;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37261;
+UPDATE `creature_template` SET `faction`=29 WHERE `entry`=37365;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37365;
+UPDATE `creature_template` SET `faction`=1216 WHERE `entry`=37271;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37271;
+UPDATE `creature_template` SET `faction`=85 WHERE `entry`=37280;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37280;
+UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37273;
+UPDATE `creature_template` SET `npcflag`=3 WHERE `entry`=37273;
+UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37270;
+UPDATE `creature_template` SET `npcflag`=1 WHERE `entry`=37270;
+UPDATE `creature_template` SET `faction`=1214 WHERE `entry`=37276;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37276;
+UPDATE `creature_template` SET `faction`=14 WHERE `entry`=37292;
+UPDATE `creature_template` SET `npcflag`=2 WHERE `entry`=37292;
diff --git a/sql/updates/world/2014_04_28_02_world_creature_template.sql b/sql/updates/world/2014_04_28_02_world_creature_template.sql
new file mode 100644
index 00000000000..f01b87d53ff
--- /dev/null
+++ b/sql/updates/world/2014_04_28_02_world_creature_template.sql
@@ -0,0 +1,11 @@
+--
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2 WHERE `entry`=37610;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2 WHERE `entry`=35425;
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82, `exp`=2 WHERE `entry`=35353;
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82, `exp`=2 WHERE `entry`=35354;
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82, `exp`=2 WHERE `entry`=35355;
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82, `exp`=2 WHERE `entry`=35356;
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82, `exp`=2 WHERE `entry`=35357;
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82, `exp`=2 WHERE `entry`=35358;
+UPDATE `creature_template` SET `exp`=1 WHERE `entry`=37272;
+UPDATE `creature_template` SET `exp`=2 WHERE `entry`=25389;
diff --git a/sql/updates/world/2014_04_28_03_world_command.sql b/sql/updates/world/2014_04_28_03_world_command.sql
new file mode 100644
index 00000000000..85d17f87fb6
--- /dev/null
+++ b/sql/updates/world/2014_04_28_03_world_command.sql
@@ -0,0 +1,10 @@
+DELETE FROM `command` WHERE `permission` IN (631,632,633,634,635,636,637,638,639,640);
+INSERT INTO `command` (`name`, `permission`, `help`) VALUES
+('reload creature_linked_respawn', 633, 'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
+('reload creature_loot_template', 634, 'Syntax: .reload creature_loot_template\nReload creature_loot_template table.'),
+('reload creature_onkill_reputation', 635, 'Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.'),
+('reload creature_questender', 636, 'Syntax: .reload creature_questender\nReload creature_questender table.'),
+('reload creature_queststarter', 637, 'Syntax: .reload creature_queststarter\nReload creature_queststarter table.'),
+('reload creature_summon_groups', 638, 'Syntax: .reload creature_summon_groups\nReload creature_summon_groups table.'),
+('reload creature_template', 639, 'Syntax: .reload creature_template $entry\r\nReload the specified creature''s template.'),
+('reload creature_text', 640, 'Syntax: .reload creature_text\nReload creature_text Table.');
diff --git a/sql/updates/world/2014_04_28_04_world_misc.sql b/sql/updates/world/2014_04_28_04_world_misc.sql
new file mode 100644
index 00000000000..d3dfec611ea
--- /dev/null
+++ b/sql/updates/world/2014_04_28_04_world_misc.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_dbc` WHERE `Id`=23183;
+INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES
+(23183, 0, 0, 536871296, 268435592, 4, 196864, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 0, 0, 29, 1, 0, -1, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 15, 0, 0, 12, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 'Mark of Frost - Triggered spell');
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=23183;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(23183, 'spell_mark_of_frost');
diff --git a/sql/updates/world/2014_04_28_05_world_misc.sql b/sql/updates/world/2014_04_28_05_world_misc.sql
new file mode 100644
index 00000000000..924e479d07b
--- /dev/null
+++ b/sql/updates/world/2014_04_28_05_world_misc.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `faction`=35 WHERE `entry` IN (27881,28094,28366);
+DELETE FROM `conditions` WHERE `SourceEntry`=52226 AND `SourceTypeOrReferenceId`=17;
+UPDATE `smart_scripts` SET `action_param2`=0 WHERE `action_type`=36;
diff --git a/sql/updates/world/2014_04_28_06_world_creature_template.sql b/sql/updates/world/2014_04_28_06_world_creature_template.sql
new file mode 100644
index 00000000000..04c8667d5b7
--- /dev/null
+++ b/sql/updates/world/2014_04_28_06_world_creature_template.sql
@@ -0,0 +1,8 @@
+--
+UPDATE `creature_template` SET `minlevel`=83, `maxlevel`=83 WHERE `entry`=38590;
+UPDATE `creature_template` SET `difficulty_entry_1`=37620 WHERE `entry`=37577;
+UPDATE `creature_template` SET `difficulty_entry_1`=37619 WHERE `entry`=37579;
+UPDATE `creature_template` SET `difficulty_entry_1`=37621 WHERE `entry`=37578;
+UPDATE `creature_template` SET `difficulty_entry_1`=37617 WHERE `entry`=37575;
+UPDATE `creature_template` SET `difficulty_entry_1`=37615 WHERE `entry`=37576;
+UPDATE `creature_template` SET `difficulty_entry_1`=37616 WHERE `entry`=37572;
diff --git a/sql/updates/world/2014_04_28_07_world_creature_template.sql b/sql/updates/world/2014_04_28_07_world_creature_template.sql
new file mode 100644
index 00000000000..e8852982748
--- /dev/null
+++ b/sql/updates/world/2014_04_28_07_world_creature_template.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature_template` SET `minlevel`=83, `maxlevel`=83 WHERE `entry` IN (30786,30784,30780,30782,34110,34109,34108,34106,33909,30786,30784,30782,30780,39232,39233,39234,40673,40674,40675,40670,40671,40672,38590,38698);
+UPDATE `creature_template` SET `minlevel`=82, `maxlevel`=82 WHERE `entry` IN (33999,34200,33989,33986,33984,33839,33831,33832,33828,33830,33829,33827,33700,33161,32550,38094);
+UPDATE `creature_template` SET `minlevel`=81, `maxlevel`=81 WHERE `entry` IN (34142,34141,33942,33815,33730,33737,33729,33164,33116,33163);
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry` IN (38601,38137,38134,38495,38552,38496,39011,39012,39013,37634,37611,37654,37653,37657,37678,35546,35717,35568,34170,33691);
diff --git a/sql/updates/world/2014_04_28_08_world_creature_template.sql b/sql/updates/world/2014_04_28_08_world_creature_template.sql
new file mode 100644
index 00000000000..e1260de43b1
--- /dev/null
+++ b/sql/updates/world/2014_04_28_08_world_creature_template.sql
@@ -0,0 +1,7 @@
+--
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2, `faction`=714, `unit_class`=2 WHERE `entry`=37619;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2, `faction`=714 WHERE `entry`=37621;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2 WHERE `entry`=37615;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2 WHERE `entry`=37617;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2 WHERE `entry`=37620;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2 WHERE `entry`=37616;
diff --git a/sql/updates/world/2014_04_28_09_world_creature_template.sql b/sql/updates/world/2014_04_28_09_world_creature_template.sql
new file mode 100644
index 00000000000..e7c740b8aca
--- /dev/null
+++ b/sql/updates/world/2014_04_28_09_world_creature_template.sql
@@ -0,0 +1,7 @@
+--
+UPDATE `creature_template` SET `difficulty_entry_1`=38486 WHERE `entry`=38471;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80, `exp`=2, `npcflag`=2 WHERE `entry`=38486;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37615;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37617;
+UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=37621;
+UPDATE `creature_template` SET `faction`=714 WHERE `entry`=37620;