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

2 files changed, 21 insertions, 0 deletions

diff --git a/sql/updates/world/2014_08_30_01_world_creature_addon.sql b/sql/updates/world/2014_08_30_01_world_creature_addon.sql
new file mode 100644
index 00000000000..40ce35ae05e
--- /dev/null
+++ b/sql/updates/world/2014_08_30_01_world_creature_addon.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature_addon` WHERE `guid`=137619;
diff --git a/sql/updates/world/2014_08_30_02_world_command.sql b/sql/updates/world/2014_08_30_02_world_command.sql
new file mode 100644
index 00000000000..f7972c39303
--- /dev/null
+++ b/sql/updates/world/2014_08_30_02_world_command.sql
@@ -0,0 +1,19 @@
+UPDATE `command` SET
+    `help` = 'Syntax: .server idlerestart #delay [#exit_code] [reason]\n\nRestart the server after #delay seconds if no active connections are present (no players). Use #exit_code or 2 as program exit code.'
+WHERE
+    `name` = 'server idlerestart';
+    
+UPDATE `command` SET
+    `help` = 'Syntax: .server idleshutdown #delay [#exit_code] [reason]\n\nShut the server down after #delay seconds if no active connections are present (no players). Use #exit_code or 0 as program exist code.'
+WHERE
+    `name` = 'server idleshutdown';
+
+UPDATE `command` SET
+    `help` = 'Syntax: .server restart #delay [#exit_code] [reason]\n\nRestart the server after #delay seconds. Use #exit_code or 2 as program exist code.'
+WHERE
+    `name` = 'server restart';
+
+UPDATE `command` SET
+    `help` = 'Syntax: .server shutdown #delay [#exit_code] [reason]\n\nShut the server down after #delay seconds. Use #exit_code or 0 as program exit code.'
+WHERE
+    `name` = 'server shutdown';