Combat/threat rewrite prep - merge RBAC/DB changes.

2 files changed, 12 insertions, 0 deletions

diff --git a/sql/updates/auth/3.3.5/2017_06_28_00_auth.sql b/sql/updates/auth/3.3.5/2017_06_28_00_auth.sql
new file mode 100644
index 00000000000..e854b107804
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2017_06_28_00_auth.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `rbac_permissions` SET `name`="Command: debug combat" WHERE `id`=309;
diff --git a/sql/updates/world/3.3.5/2017_06_28_01_world.sql b/sql/updates/world/3.3.5/2017_06_28_01_world.sql
new file mode 100644
index 00000000000..487cd8acc9b
--- /dev/null
+++ b/sql/updates/world/3.3.5/2017_06_28_01_world.sql
@@ -0,0 +1,10 @@
+-- 
+UPDATE `command` SET `name`="debug combat", `help`="Syntax: .debug combat
+
+Lists the target's (or own) combat references." WHERE `name` IN ("debug hostil","debug combat");
+UPDATE `command` SET `help`="Syntax: .debug threat
+
+Lists the units threatened by target (or self). If target has a threat list, lists that threat list, too." WHERE `name`="debug threat";
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`="spell_warr_vigilance_redirect_threat";
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (59665,"spell_warr_vigilance_redirect_threat");