DB/Commits: fix the filenaming on the files used in pull request from nelgano and fix some errors, please do not create pull requests for database fixes, the issuetracker will do...

Closes #2732, #4461, #1860, #2026, #4187, #4569

10 files changed, 14 insertions, 23 deletions

diff --git a/sql/updates/world/2011_12_30_02_world_misc.sql b/sql/updates/world/2011_12_30_02_world_misc.sql
deleted file mode 100644
index 5e52a80ab35..00000000000
--- a/sql/updates/world/2011_12_30_02_world_misc.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Ogre Heaven fix PrevQuestID by shlomi1515
--- Closes #2732
-
-UPDATE quest_template SET PrevQuestID='11000' WHERE ID='11009';
diff --git a/sql/updates/world/2011_12_30_05_world_misc.sql b/sql/updates/world/2011_12_30_05_world_misc.sql
deleted file mode 100644
index 1ee9c8799ca..00000000000
--- a/sql/updates/world/2011_12_30_05_world_misc.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Fix Report to Gryan Stoutmantle creature_questrelation values by nelegalno
--- Closes #4461
-
-DELETE FROM `creature_questrelation` WHERE `quest` = 109;
-INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES
-(233, 109), -- Farmer Saldean
-(237, 109), -- Farmer Furlbrow
-(240, 109), -- Marshal Dughan
-(261, 109), -- Guard Thomas
-(294, 109), -- Marshal Haggard
-(963, 109); -- Deputy Rainer
diff --git a/sql/updates/world/2011_12_30_06_world_misc.sql b/sql/updates/world/2011_12_30_06_world_misc.sql
deleted file mode 100644
index ecd6360b911..00000000000
--- a/sql/updates/world/2011_12_30_06_world_misc.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Drowned Guardian & Phylactery Guardian summoned NPC should not give XP fix by tobmaps
--- Closes #1860
-UPDATE `creature_template` SET `flags_extra` = 64 WHERE `entry` IN (26225, 26224);
diff --git a/sql/updates/world/2012_01_01_00_world_misc.sql b/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql
index 4bbd2d371c8..e1dce65f3bc 100644
--- a/sql/updates/world/2012_01_01_00_world_misc.sql
+++ b/sql/updates/world/2012_01_06_04_world_creature_questrelation.sql
@@ -1,6 +1,4 @@
 -- Fix Captain Vimes questrelation
--- Closes #4569
-
 DELETE FROM `creature_questrelation` WHERE `quest`=1220;
 INSERT INTO `creature_questrelation` (`id`,`quest`) VALUES
 (4947,1220),
diff --git a/sql/updates/world/2012_01_01_01_world_misc.sql b/sql/updates/world/2012_01_06_05_world_creature_template.sql
index 412fab4dab2..412fab4dab2 100644
--- a/sql/updates/world/2012_01_01_01_world_misc.sql
+++ b/sql/updates/world/2012_01_06_05_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_06_world_quest_template.sql b/sql/updates/world/2012_01_06_06_world_quest_template.sql
new file mode 100644
index 00000000000..4f58452d980
--- /dev/null
+++ b/sql/updates/world/2012_01_06_06_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Ogre Heaven fix PrevQuestID
+UPDATE `quest_template` SET `PrevQuestID`=11000 WHERE `ID`=11009;
diff --git a/sql/updates/world/2011_12_30_08_world_misc.sql b/sql/updates/world/2012_01_06_07_world_sai.sql
index df9a75bacd3..5d322367250 100644
--- a/sql/updates/world/2011_12_30_08_world_misc.sql
+++ b/sql/updates/world/2012_01_06_07_world_sai.sql
@@ -1,6 +1,4 @@
--- Fix Quest 11795, 11887 'Emergency Protocol: Section 8.2, Paragraph C', 'Emergency Supplies' by Pitcrawler
--- Closes #2026 & #4187
-
+-- Fix Quest 11795, 11887 'Emergency Protocol: Section 8.2, Paragraph C', 'Emergency Supplies' 
 SET @NPC    :=25841; -- Fizzcrank Recon Pilot
 SET @Gossip :=21248;
 
diff --git a/sql/updates/world/2011_12_30_04_world_misc.sql b/sql/updates/world/2012_01_06_08_world_creature_template.sql
index d59a5551f14..d59a5551f14 100644
--- a/sql/updates/world/2011_12_30_04_world_misc.sql
+++ b/sql/updates/world/2012_01_06_08_world_creature_template.sql
diff --git a/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql b/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql
new file mode 100644
index 00000000000..c2af677f047
--- /dev/null
+++ b/sql/updates/world/2012_01_06_09_world_creature_questrelation.sql
@@ -0,0 +1,9 @@
+-- Fix Report to Gryan Stoutmantle creature_questrelation values
+DELETE FROM `creature_questrelation` WHERE `quest` = 109;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES
+(233,109), -- Farmer Saldean
+(237,109), -- Farmer Furlbrow
+(240,109), -- Marshal Dughan
+(261,109), -- Guard Thomas
+(294,109), -- Marshal Haggard
+(963,109); -- Deputy Rainer
diff --git a/sql/updates/world/2012_01_06_10_world_creature_template.sql b/sql/updates/world/2012_01_06_10_world_creature_template.sql
new file mode 100644
index 00000000000..c121fd7424b
--- /dev/null
+++ b/sql/updates/world/2012_01_06_10_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Drowned Guardian & Phylactery Guardian summoned NPC should not give XP
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|64 WHERE `entry` IN (26225,26224);