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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h

8 files changed, 36 insertions, 1 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index e3f8596c7d6..f08ccc76925 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -679,7 +679,7 @@ DROP TABLE IF EXISTS `character_glyphs`;
 CREATE TABLE `character_glyphs` (
   `guid` int(10) unsigned NOT NULL,
   `spec` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `glyph1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `glyph1` smallint(5) unsigned DEFAULT '0',
   `glyph2` smallint(5) unsigned DEFAULT '0',
   `glyph3` smallint(5) unsigned DEFAULT '0',
   `glyph4` smallint(5) unsigned DEFAULT '0',
diff --git a/sql/updates/characters/2012_10_09_00_character_glyphs.sql b/sql/updates/characters/2012_10_09_00_character_glyphs.sql
new file mode 100644
index 00000000000..b90fa7d7682
--- /dev/null
+++ b/sql/updates/characters/2012_10_09_00_character_glyphs.sql
@@ -0,0 +1 @@
+ALTER TABLE character_glyphs CHANGE glyph1 glyph1 smallint(5) unsigned DEFAULT '0';
diff --git a/sql/updates/world/2012_10_07_00_world_creature_loot_template.sql b/sql/updates/world/2012_10_07_00_world_creature_loot_template.sql
new file mode 100644
index 00000000000..2829725c76c
--- /dev/null
+++ b/sql/updates/world/2012_10_07_00_world_creature_loot_template.sql
@@ -0,0 +1,2 @@
+-- increase droprate for Plump Buzzard Wing
+UPDATE `creature_loot_template` SET `chanceOrQuestChance`=-50 WHERE `item`=23239;
diff --git a/sql/updates/world/2012_10_07_01_world_spell_proc_event.sql b/sql/updates/world/2012_10_07_01_world_spell_proc_event.sql
new file mode 100644
index 00000000000..810cd90290c
--- /dev/null
+++ b/sql/updates/world/2012_10_07_01_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `procflags`=0x15510 WHERE `entry`=53386;
diff --git a/sql/updates/world/2012_10_09_00_world_spell_groups.sql b/sql/updates/world/2012_10_09_00_world_spell_groups.sql
new file mode 100644
index 00000000000..71f58c6322e
--- /dev/null
+++ b/sql/updates/world/2012_10_09_00_world_spell_groups.sql
@@ -0,0 +1,9 @@
+-- Improved Scorch, Improved Shadow Bolt and Winter's Chill effect should not stack
+DELETE FROM `spell_group` WHERE `id`=1037;
+INSERT INTO `spell_group`(`id`,`spell_id`) VALUES
+(1037,22959),
+(1037,17800),
+(1037,12579);
+
+DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1037;
+INSERT INTO `spell_group_stack_rules`(`group_id`,`stack_rule`) VALUES (1037,3);
diff --git a/sql/updates/world/2012_10_09_01_world_spell_groups.sql b/sql/updates/world/2012_10_09_01_world_spell_groups.sql
new file mode 100644
index 00000000000..75c57d0f77f
--- /dev/null
+++ b/sql/updates/world/2012_10_09_01_world_spell_groups.sql
@@ -0,0 +1,11 @@
+-- Blood Frenzy (Warrior) and Savage Combat effect should not stack
+DELETE FROM `spell_group` WHERE `id`=1119;
+INSERT INTO `spell_group`(`id`,`spell_id`) VALUES
+(1119,30069),
+(1119,58684);
+
+DELETE FROM `spell_group_stack_rules` WHERE `group_id`=1119;
+INSERT INTO `spell_group_stack_rules`(`group_id`,`stack_rule`) VALUES (1119,3);
+
+-- Remove invalid spell_groups
+DELETE FROM `spell_group` WHERE `id` IN (1038,1039);
diff --git a/sql/updates/world/2012_10_09_02_world_spell_groups.sql b/sql/updates/world/2012_10_09_02_world_spell_groups.sql
new file mode 100644
index 00000000000..8e4864bc039
--- /dev/null
+++ b/sql/updates/world/2012_10_09_02_world_spell_groups.sql
@@ -0,0 +1,9 @@
+SET @GROUP := 1120;
+-- Totem of Wrath and Heart of the Crusader effect should not stack
+DELETE FROM `spell_group` WHERE `id`=@GROUP;
+INSERT INTO `spell_group`(`id`,`spell_id`) VALUES
+(@GROUP,21183),
+(@GROUP,30708);
+
+DELETE FROM `spell_group_stack_rules` WHERE `group_id`=@GROUP;
+INSERT INTO `spell_group_stack_rules`(`group_id`,`stack_rule`) VALUES (@GROUP,3);
diff --git a/sql/updates/world/2012_10_10_00_world_battleground_template.sql b/sql/updates/world/2012_10_10_00_world_battleground_template.sql
new file mode 100644
index 00000000000..a9a1cdb04d1
--- /dev/null
+++ b/sql/updates/world/2012_10_10_00_world_battleground_template.sql
@@ -0,0 +1,2 @@
+-- Remove all bgs from e1bee86ee6f5c3ab7b1da6d1b54c98c2851f11ec
+DELETE FROM `battleground_template` WHERE `id` = 6; -- all Bgs
\ No newline at end of file