Merge branch '3.3.5-commandfixes' into 3.3.5 (PR #16335)

2 files changed, 39 insertions, 0 deletions

diff --git a/sql/updates/auth/3.3.5/2016_05_11_00_auth.sql b/sql/updates/auth/3.3.5/2016_05_11_00_auth.sql
new file mode 100644
index 00000000000..254f3d801d6
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2016_05_11_00_auth.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `rbac_permissions` WHERE `id` IN (837,838,839,840);
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES (837,"Command: .npc evade"), (838,"Command: .pet level"), (839,"Command: .server shutdown force"), (840,"Command: .server restart force");
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` IN (837,838,839,840);
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES (196,837),(196,838),(196,839),(196,840);
diff --git a/sql/updates/world/3.3.5/2016_05_11_00_world.sql b/sql/updates/world/3.3.5/2016_05_11_00_world.sql
new file mode 100644
index 00000000000..9be7c8d3a0d
--- /dev/null
+++ b/sql/updates/world/3.3.5/2016_05_11_00_world.sql
@@ -0,0 +1,33 @@
+--
+DELETE FROM `command` WHERE `name` IN ('server shutdown force','server restart force');
+INSERT INTO `command` (`name`,`permission`) VALUES ('server shutdown force', 839),('server restart force', 840);
+UPDATE `command` SET `help`="Syntax: .server shutdown [force] #delay [#exit_code] [reason]
+
+Shut the server down after #delay seconds. Use #exit_code or 0 as program exit code. Specify 'force' to allow short-term shutdown despite other players being connected." WHERE `name` IN ('server shutdown','server shutdown force');
+UPDATE `command` SET `help`="Syntax: .server restart [force] #delay [#exit_code] [reason]
+
+Restart the server after #delay seconds. Use #exit_code or 2 as program exit code. Specify 'force' to allow short-term shutdown despite other players being connected." WHERE `name` IN ('server restart','server restart force');
+
+
+DELETE FROM `command` WHERE `permission` IN (571,575);
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES
+("npc add", 571, "Syntax: .npc add #entry
+  Spawn a creature using template #entry and save it to the database.
+  If you want a temporary spawn that is not saved to the database, use .npc add temp instead."),
+("npc add temp", 575, "Syntax: .npc add temp [loot/noloot] #entry
+Adds temporary NPC, not saved to database.
+  Specify 'loot' to have the NPC's corpse stick around for some time after death, allowing it to be looted.
+  Specify 'noloot' to have the corpse disappear immediately.");
+
+DELETE FROM `command` WHERE `permission`=837;
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES ("npc evade",837,"Syntax: .npc evade [reason] [force]
+Makes the targeted NPC enter evade mode.\nDefaults to specifying EVADE_REASON_OTHER, override this by providing the reason string (ex.: .npc evade EVADE_REASON_BOUNDARY).\nSpecify 'force' to clear any pre-existing evade state before evading - this may cause weirdness, use at your own risk.");
+
+DELETE FROM `command` WHERE `permission`=838;
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES ("pet level",838,"Syntax: .pet level #dLevel
+Increases/decreases the pet's level by #dLevel. Pet's level cannot exceed the owner's level.");
+
+DELETE FROM `trinity_string` WHERE `entry` IN (11015,11016);
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
+(11015,"This creature does not have an active CreatureAI assigned to it."),
+(11016,"Select a player or player pet.");