Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1eca51b follow-up, nuke command.permission from orbit; it was only duplicating data already stored in the core.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/46d4e2fa8378eed414c07eb161a19b772c474735)
This commit is contained in:
hondacrx
2022-06-09 16:27:15 -04:00
parent 8edba61e49
commit ed79f93c7b
48 changed files with 223 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/CommandManager.cs
+3 -7
View File
@@ -60,7 +60,7 @@ namespace Game.Chat
do
{
string name = result.Read<string>(0);
SetDataForCommandInTable(GetCommands(), name, result.Read<uint>(1), result.Read<string>(2), name);
SetDataForCommandInTable(GetCommands(), name, result.Read<string>(1), name);
}
while (result.NextRow());
}
@@ -94,7 +94,7 @@ namespace Game.Chat
command.SortChildCommands();
}
static bool SetDataForCommandInTable(ICollection<ChatCommand> table, string text, uint permission, string help, string fullcommand)
static bool SetDataForCommandInTable(ICollection<ChatCommand> table, string text, string help, string fullcommand)
{
StringArguments args = new(text);
string cmd = args.NextString().ToLower();
@@ -109,7 +109,7 @@ namespace Game.Chat
if (!command.ChildCommands.Empty())
{
var arg = args.NextString("");
if (SetDataForCommandInTable(command.ChildCommands, arg, permission, help, fullcommand))
if (SetDataForCommandInTable(command.ChildCommands, arg, help, fullcommand))
return true;
else if (!arg.IsEmpty())
return false;
@@ -123,10 +123,6 @@ namespace Game.Chat
return false;
}
if (command.Permission != (RBACPermissions)permission)
Log.outInfo(LogFilter.Misc, "Table `command` overwrite for command '{0}' default permission ({1}) by {2}", fullcommand, command.Permission, permission);
command.Permission = (RBACPermissions)permission;
command.Help = help;
return true;
}