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

(cherry picked from commit e35092c6a164e929f9684b350093b2beefee5d86)

7 files changed, 19 insertions, 6 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 65a8d7b95d9..2f4949daa8f 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1579,7 +1579,7 @@ INSERT INTO `rbac_permissions` VALUES
 (304,'Command: debug bg'),
 (305,'Command: debug entervehicle'),
 (306,'Command: debug getitemstate'),
-(309,'Command: debug hostil'),
+(309,'Command: debug combat'),
 (310,'Command: debug itemexpire'),
 (311,'Command: debug lootrecipient'),
 (312,'Command: debug los'),
@@ -2301,7 +2301,8 @@ INSERT INTO `updates` VALUES
 ('2017_06_15_00_auth.sql','DD71F25C1E61FD5F836931B02703BE3BD1B4F156','ARCHIVED','2017-06-15 15:20:50',0),
 ('2017_06_18_00_auth.sql','7200968BFC2D76499149937B19F2153FD2ABC397','ARCHIVED','2017-06-18 22:13:37',0),
 ('2017_06_25_00_auth.sql','A2DA6A64D4217992EF766915DEBD517DB0834E01','ARCHIVED','2017-06-25 00:54:10',0),
-('2017_06_28_00_auth.sql','6E58300D4D4DAAEE89107ECB3CB7DA8529DA738F','ARCHIVED','2017-06-28 19:11:09',0),
+('2017_06_28_00_auth_master.sql','6E58300D4D4DAAEE89107ECB3CB7DA8529DA738F','ARCHIVED','2017-06-28 19:11:09',0),
+('2017_06_28_00_auth_rbac.sql','D32EF80F57F629C23395D80F06E91D7E40719F83','ARCHIVED','2017-06-28 00:00:00',0),
 ('2017_06_30_00_auth.sql','C73BD277D211DBE1BB86BB1B443CA8F292D8ADEE','ARCHIVED','2017-06-30 16:18:51',0),
 ('2017_08_04_00_auth.sql','2E994A704C64FECE3CE0883ED0CAC5E5A0E3A36C','ARCHIVED','2017-08-04 23:46:32',0),
 ('2017_08_13_00_auth_2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','ARCHIVED','2017-08-13 12:00:00',0),
diff --git a/sql/old/7/auth/01_2018_02_19/2017_06_28_00_auth.sql b/sql/old/7/auth/01_2018_02_19/2017_06_28_00_auth_master.sql
index 9924b951cb1..9924b951cb1 100644
--- a/sql/old/7/auth/01_2018_02_19/2017_06_28_00_auth.sql
+++ b/sql/old/7/auth/01_2018_02_19/2017_06_28_00_auth_master.sql
diff --git a/sql/updates/auth/master/2017_06_28_00_auth_rbac.sql b/sql/updates/auth/master/2017_06_28_00_auth_rbac.sql
new file mode 100644
index 00000000000..e854b107804
--- /dev/null
+++ b/sql/updates/auth/master/2017_06_28_00_auth_rbac.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `rbac_permissions` SET `name`="Command: debug combat" WHERE `id`=309;
diff --git a/sql/updates/world/master/2020_07_16_07_world_2017_06_28_01_world.sql b/sql/updates/world/master/2020_07_16_07_world_2017_06_28_01_world.sql
new file mode 100644
index 00000000000..487cd8acc9b
--- /dev/null
+++ b/sql/updates/world/master/2020_07_16_07_world_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");
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 7c12bccdde6..d4daf026948 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -214,7 +214,7 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_DEBUG_GETITEMSTATE                     = 306,
     RBAC_PERM_COMMAND_DEBUG_GETITEMVALUE                     = 307, // DEPRECATED: DON'T REUSE
     RBAC_PERM_COMMAND_DEBUG_GETVALUE                         = 308, // DEPRECATED: DON'T REUSE
-    RBAC_PERM_COMMAND_DEBUG_HOSTIL                           = 309,
+    RBAC_PERM_COMMAND_DEBUG_COMBAT                           = 309,
     RBAC_PERM_COMMAND_DEBUG_ITEMEXPIRE                       = 310,
     RBAC_PERM_COMMAND_DEBUG_LOOTRECIPIENT                    = 311,
     RBAC_PERM_COMMAND_DEBUG_LOS                              = 312,
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index eb26213e644..4e9e91860a9 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -81,7 +81,7 @@ public:
         static std::vector<ChatCommand> debugCommandTable =
         {
             { "threat",        rbac::RBAC_PERM_COMMAND_DEBUG_THREAT,        false, &HandleDebugThreatListCommand,       "" },
-            { "hostil",        rbac::RBAC_PERM_COMMAND_DEBUG_HOSTIL,        false, &HandleDebugHostileRefListCommand,   "" },
+            { "combat",        rbac::RBAC_PERM_COMMAND_DEBUG_COMBAT,        false, &HandleDebugCombatListCommand,       "" },
             { "anim",          rbac::RBAC_PERM_COMMAND_DEBUG_ANIM,          false, &HandleDebugAnimCommand,             "" },
             { "arena",         rbac::RBAC_PERM_COMMAND_DEBUG_ARENA,         true,  &HandleDebugArenaCommand,            "" },
             { "bg",            rbac::RBAC_PERM_COMMAND_DEBUG_BG,            true,  &HandleDebugBattlegroundCommand,     "" },
@@ -859,7 +859,7 @@ public:
         return true;
     }
 
-    static bool HandleDebugHostileRefListCommand(ChatHandler* handler, char const* /*args*/)
+    static bool HandleDebugCombatListCommand(ChatHandler* handler, char const* /*args*/)
     {
         Unit* target = handler->getSelectedUnit();
         if (!target)
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 7f9be35dd77..f5bcf9df4c4 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -1398,7 +1398,7 @@ class spell_warr_vigilance : public SpellScriptLoader
         }
 };
 
-// 50725 Vigilance
+// 50725 - Vigilance (Reset Taunt Cooldown)
 class spell_warr_vigilance_trigger : public SpellScriptLoader
 {
     public: