From ae7d55bb3bb2fcbd04c404a13662c5d948ff6abf Mon Sep 17 00:00:00 2001
From: Shocker <shocker@freakz.ro>
Date: Thu, 5 May 2011 22:22:12 +0300
Subject: Core/Misc: Corrections after recent pull merge

---
 sql/updates/world/2011_03_21_2_world_command.sql          | 3 ---
 sql/updates/world/2011_03_21_3_world_spell_proc_event.sql | 2 --
 sql/updates/world/2011_05_05_00_world_command.sql         | 3 +++
 sql/updates/world/2011_05_05_01_spell_proc_event.sql      | 1 +
 sql/updates/world/dislodged Foreign Object.sql            | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 sql/updates/world/2011_03_21_2_world_command.sql
 delete mode 100644 sql/updates/world/2011_03_21_3_world_spell_proc_event.sql
 create mode 100644 sql/updates/world/2011_05_05_00_world_command.sql
 create mode 100644 sql/updates/world/2011_05_05_01_spell_proc_event.sql
 delete mode 100644 sql/updates/world/dislodged Foreign Object.sql

(limited to 'sql')

diff --git a/sql/updates/world/2011_03_21_2_world_command.sql b/sql/updates/world/2011_03_21_2_world_command.sql
deleted file mode 100644
index 0c16d9b7580..00000000000
--- a/sql/updates/world/2011_03_21_2_world_command.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `command` WHERE `name`='modify scale';
-INSERT INTO `command` VALUES
-('modify scale',1,'.modify scale #scale\nModify size of the selected player or creature to \"normal scale\"*rate. If no player or creature is selected, modify your size.\n#rate may range from 0.1 to 10.');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_21_3_world_spell_proc_event.sql b/sql/updates/world/2011_03_21_3_world_spell_proc_event.sql
deleted file mode 100644
index 5e1d017fb3a..00000000000
--- a/sql/updates/world/2011_03_21_3_world_spell_proc_event.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry`=11129;
-INSERT INTO `spell_proc_event` VALUES (11129, 0x04, 3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 0); -- Combustion
\ No newline at end of file
diff --git a/sql/updates/world/2011_05_05_00_world_command.sql b/sql/updates/world/2011_05_05_00_world_command.sql
new file mode 100644
index 00000000000..b31ffc2ff0a
--- /dev/null
+++ b/sql/updates/world/2011_05_05_00_world_command.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name`='modify scale';
+INSERT INTO `command` VALUES
+('modify scale',1,'.modify scale #scale\nModify size of the selected player or creature to \"normal scale\"*rate. If no player or creature is selected, modify your size.\n#rate may range from 0.1 to 10.');
diff --git a/sql/updates/world/2011_05_05_01_spell_proc_event.sql b/sql/updates/world/2011_05_05_01_spell_proc_event.sql
new file mode 100644
index 00000000000..6c5db5d3663
--- /dev/null
+++ b/sql/updates/world/2011_05_05_01_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `procFlags`=0x00010000 WHERE `entry` IN (71602, 71645);
diff --git a/sql/updates/world/dislodged Foreign Object.sql b/sql/updates/world/dislodged Foreign Object.sql
deleted file mode 100644
index 247af7ad891..00000000000
--- a/sql/updates/world/dislodged Foreign Object.sql	
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `spell_proc_event` SET `procFlags`=0x00010000 WHERE `entry` IN (71602,71645); -- Dislodged Foreign Object
\ No newline at end of file
-- 
cgit v1.2.3