From ed79f93c7bb7094ba2fea9c0de44deb3434d9222 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 9 Jun 2022 16:27:15 -0400 Subject: [PATCH] 1eca51b follow-up, nuke `command`.`permission` from orbit; it was only duplicating data already stored in the core. Port From (https://github.com/TrinityCore/TrinityCore/commit/46d4e2fa8378eed414c07eb161a19b772c474735) --- Source/Framework/Constants/AccountConst.cs | 123 ++++++------------ Source/Framework/Constants/Language.cs | 19 +++ .../Database/Databases/WorldDatabase.cs | 2 +- Source/Game/Chat/CommandArgs.cs | 7 +- Source/Game/Chat/CommandAttribute.cs | 3 +- Source/Game/Chat/CommandHandler.cs | 1 + Source/Game/Chat/CommandManager.cs | 10 +- Source/Game/Chat/Commands/AccountCommands.cs | 8 +- .../Game/Chat/Commands/AchievementCommands.cs | 2 +- Source/Game/Chat/Commands/AhBotCommands.cs | 6 +- Source/Game/Chat/Commands/ArenaCommands.cs | 2 +- .../Game/Chat/Commands/BNetAccountCommands.cs | 6 +- Source/Game/Chat/Commands/BanCommands.cs | 8 +- .../Game/Chat/Commands/BattleFieldCommands.cs | 2 +- Source/Game/Chat/Commands/CastCommands.cs | 2 +- .../Game/Chat/Commands/CharacterCommands.cs | 6 +- Source/Game/Chat/Commands/CheatCommands.cs | 2 +- Source/Game/Chat/Commands/DebugCommands.cs | 94 ++++++------- Source/Game/Chat/Commands/DeserterCommands.cs | 6 +- Source/Game/Chat/Commands/DisableCommands.cs | 6 +- Source/Game/Chat/Commands/EventCommands.cs | 4 +- Source/Game/Chat/Commands/GMCommands.cs | 47 +++---- .../Game/Chat/Commands/GameObjectCommands.cs | 6 +- Source/Game/Chat/Commands/GoCommands.cs | 6 +- Source/Game/Chat/Commands/GroupCommands.cs | 4 +- Source/Game/Chat/Commands/GuildCommands.cs | 2 +- Source/Game/Chat/Commands/HonorCommands.cs | 4 +- Source/Game/Chat/Commands/InstanceCommands.cs | 2 +- Source/Game/Chat/Commands/LFGCommands.cs | 3 +- Source/Game/Chat/Commands/LearnCommands.cs | 6 +- Source/Game/Chat/Commands/ListCommands.cs | 2 +- Source/Game/Chat/Commands/LookupCommands.cs | 12 +- Source/Game/Chat/Commands/MMapsCommands.cs | 2 +- Source/Game/Chat/Commands/MessageCommands.cs | 4 +- Source/Game/Chat/Commands/ModifyCommands.cs | 4 +- Source/Game/Chat/Commands/NPCCommands.cs | 10 +- Source/Game/Chat/Commands/PetCommands.cs | 2 +- Source/Game/Chat/Commands/QuestCommands.cs | 2 +- Source/Game/Chat/Commands/RbacCommands.cs | 4 +- Source/Game/Chat/Commands/ReloadCommand.cs | 22 +--- Source/Game/Chat/Commands/ResetCommands.cs | 2 +- Source/Game/Chat/Commands/SceneCommands.cs | 2 +- Source/Game/Chat/Commands/SendCommands.cs | 2 +- Source/Game/Chat/Commands/ServerCommands.cs | 12 +- Source/Game/Chat/Commands/TeleCommands.cs | 2 +- Source/Game/Chat/Commands/TicketCommands.cs | 10 +- Source/Game/Chat/Commands/TitleCommands.cs | 4 +- Source/Game/Chat/Commands/WPCommands.cs | 2 +- 48 files changed, 223 insertions(+), 276 deletions(-) diff --git a/Source/Framework/Constants/AccountConst.cs b/Source/Framework/Constants/AccountConst.cs index a59677a3f..ddcfc57f1 100644 --- a/Source/Framework/Constants/AccountConst.cs +++ b/Source/Framework/Constants/AccountConst.cs @@ -112,6 +112,11 @@ namespace Framework.Constants // Free Space For Core Permissions (Till 149) // Roles (Permissions With Delegated Permissions) Use 199 And Descending + RoleAdministrator = 196, + RoleGamemaster = 197, + RoleModerator = 198, + RolePlayer = 199, + CommandRbac = 200, CommandRbacAcc = 201, CommandRbacAccPermList = 202, @@ -124,7 +129,7 @@ namespace Framework.Constants CommandBnetAccountLockCountry = 209, CommandBnetAccountLockIp = 210, CommandBnetAccountPassword = 211, - CommandBnetAccountSet = 212, + // 212 previously used, do not reuse CommandBnetAccountSetPassword = 213, CommandBnetAccountLink = 214, CommandBnetAccountUnlink = 215, @@ -142,41 +147,41 @@ namespace Framework.Constants CommandAccountSetAddon = 227, CommandAccountSetSecLevel = 228, CommandAccountSetPassword = 229, - CommandAchievement = 230, + // 230 previously used, do not reuse CommandAchievementAdd = 231, - CommandArena = 232, + // 232 previously used, do not reuse CommandArenaCaptain = 233, CommandArenaCreate = 234, CommandArenaDisband = 235, CommandArenaInfo = 236, CommandArenaLookup = 237, CommandArenaRename = 238, - CommandBan = 239, + // 239 previously used, do not reuse CommandBanAccount = 240, CommandBanCharacter = 241, CommandBanIp = 242, CommandBanPlayeraccount = 243, - CommandBaninfo = 244, + // 244 previously used, do not reuse CommandBaninfoAccount = 245, CommandBaninfoCharacter = 246, CommandBaninfoIp = 247, - CommandBanlist = 248, + // 248 previously used, do not reuse CommandBanlistAccount = 249, CommandBanlistCharacter = 250, CommandBanlistIp = 251, - CommandUnban = 252, + // 252 previously used, do not reuse CommandUnbanAccount = 253, CommandUnbanCharacter = 254, CommandUnbanIp = 255, CommandUnbanPlayeraccount = 256, - CommandBf = 257, + // 257 previously used, do not reuse CommandBfStart = 258, CommandBfStop = 259, CommandBfSwitch = 260, CommandBfTimer = 261, CommandBfEnable = 262, CommandAccountEmail = 263, - CommandAccountSetSec = 264, + // 264 previously used, do not reuse CommandAccountSetSecEmail = 265, CommandAccountSetSecRegmail = 266, CommandCast = 267, @@ -185,11 +190,11 @@ namespace Framework.Constants CommandCastSelf = 270, CommandCastTarget = 271, CommandCastDest = 272, - CommandCharacter = 273, + // 273 previously used, do not reuse CommandCharacterCustomize = 274, CommandCharacterChangefaction = 275, CommandCharacterChangerace = 276, - CommandCharacterDeleted = 277, + // 277 previously used, do not reuse CommandCharacterDeletedDelete = 278, CommandCharacterDeletedList = 279, CommandCharacterDeletedRestore = 280, @@ -200,10 +205,10 @@ namespace Framework.Constants CommandCharacterReputation = 285, CommandCharacterTitles = 286, CommandLevelup = 287, - CommandPdump = 288, + // 288 previously used, do not reuse CommandPdumpLoad = 289, CommandPdumpWrite = 290, - CommandCheat = 291, + // 291 previously used, do not reuse CommandCheatCasttime = 292, CommandCheatCooldown = 293, CommandCheatExplore = 294, @@ -213,55 +218,13 @@ namespace Framework.Constants CommandCheatTaxi = 298, CommandCheatWaterwalk = 299, CommandDebug = 300, - CommandDebugAnim = 301, - CommandDebugAreatriggers = 302, - CommandDebugArena = 303, - CommandDebugBg = 304, - CommandDebugEntervehicle = 305, - CommandDebugGetitemstate = 306, - CommandDebugGetitemvalue = 307, // DEPRECATED: DON'T REUSE - CommandDebugGetvalue = 308, // DEPRECATED: DON'T REUSE - CommandDebugCombat = 309, - CommandDebugItemexpire = 310, - CommandDebugLootrecipient = 311, - CommandDebugLos = 312, - CommandDebugMod32value = 313, // DEPRECATED: DON'T REUSE - CommandDebugMoveflags = 314, - CommandDebugPlay = 315, - CommandDebugPlayCinematic = 316, - CommandDebugPlayMovie = 317, - CommandDebugPlaySound = 318, - CommandDebugSend = 319, - CommandDebugSendBuyerror = 320, - CommandDebugSendChannelnotify = 321, - CommandDebugSendChatmessage = 322, - CommandDebugSendEquiperror = 323, - CommandDebugSendLargepacket = 324, - CommandDebugSendOpcode = 325, - CommandDebugSendQinvalidmsg = 326, - CommandDebugSendQpartymsg = 327, - CommandDebugSendSellerror = 328, - CommandDebugSendSetphaseshift = 329, - CommandDebugSendSpellfail = 330, - CommandDebugSetaurastate = 331, - CommandDebugSetbit = 332, // DEPRECATED: DON'T REUSE - CommandDebugSetitemvalue = 333, // DEPRECATED: DON'T REUSE - CommandDebugSetvalue = 334, // DEPRECATED: DON'T REUSE - CommandDebugSetvid = 335, - CommandDebugSpawnvehicle = 336, - CommandDebugThreat = 337, - CommandDebugUpdate = 338, // DEPRECATED: DON'T REUSE - CommandDebugWorldState = 339, - CommandWpgps = 340, - CommandDeserter = 341, - CommandDeserterBg = 342, + // 301-342 previously used, do not reuse CommandDeserterBgAdd = 343, CommandDeserterBgRemove = 344, - CommandDeserterInstance = 345, + // 345 previously used, do not reuse CommandDeserterInstanceAdd = 346, CommandDeserterInstanceRemove = 347, - CommandDisable = 348, - CommandDisableAdd = 349, + // 348-349 previously used, do not reuse CommandDisableAddCriteria = 350, CommandDisableAddBattleground = 351, CommandDisableAddMap = 352, @@ -270,7 +233,7 @@ namespace Framework.Constants CommandDisableAddQuest = 355, CommandDisableAddSpell = 356, CommandDisableAddVmap = 357, - CommandDisableRemove = 358, + // 358 previously used, do not reuse CommandDisableRemoveCriteria = 359, CommandDisableRemoveBattleground = 360, CommandDisableRemoveMap = 361, @@ -279,7 +242,7 @@ namespace Framework.Constants CommandDisableRemoveQuest = 364, CommandDisableRemoveSpell = 365, CommandDisableRemoveVmap = 366, - CommandEvent = 367, + CommandEventInfo = 367, CommandEventActivelist = 368, CommandEventStart = 369, CommandEventStop = 370, @@ -299,7 +262,7 @@ namespace Framework.Constants // = 384, // DEPRECATED: DON'T REUSE // = 385, // DEPRECATED: DON'T REUSE // = 386, // DEPRECATED: DON'T REUSE - CommandGobject = 387, + // 387 previously used, do not reuse CommandGobjectActivate = 388, CommandGobjectAdd = 389, CommandGobjectAddTemp = 390, @@ -307,12 +270,12 @@ namespace Framework.Constants CommandGobjectInfo = 392, CommandGobjectMove = 393, CommandGobjectNear = 394, - CommandGobjectSet = 395, + // 395 previously used, do not reuse CommandGobjectSetPhase = 396, CommandGobjectSetState = 397, CommandGobjectTarget = 398, CommandGobjectTurn = 399, - CommandDebugTransport = 400, + // 400 previously used, do not reuse CommandGuild = 401, CommandGuildCreate = 402, CommandGuildDelete = 403, @@ -330,7 +293,7 @@ namespace Framework.Constants CommandInstanceStats = 415, CommandInstanceSavedata = 416, CommandLearn = 417, - CommandLearnAll = 418, + // 418 previously used, do not reuse CommandLearnAllMy = 419, CommandLearnAllMyClass = 420, CommandLearnAllMyPettalents = 421, @@ -342,13 +305,13 @@ namespace Framework.Constants CommandLearnAllLang = 427, CommandLearnAllRecipes = 428, CommandUnlearn = 429, - CommandLfg = 430, + // 430 previously used, do not reuse CommandLfgPlayer = 431, CommandLfgGroup = 432, CommandLfgQueue = 433, CommandLfgClean = 434, CommandLfgOptions = 435, - CommandList = 436, + // 436 previously used, do not reuse CommandListCreature = 437, CommandListItem = 438, CommandListObject = 439, @@ -482,7 +445,7 @@ namespace Framework.Constants CommandModifySpell = 567, CommandModifyStandstate = 568, CommandModifyTalentpoints = 569, - CommandNpc = 570, + // 570 previously used, do not reuse CommandNpcAdd = 571, CommandNpcAddFormation = 572, CommandNpcAddItem = 573, @@ -540,7 +503,7 @@ namespace Framework.Constants CommandReloadAreatriggerTeleport = 625, CommandReloadAuctions = 626, CommandReloadAutobroadcast = 627, - CommandReloadCommand = 628, + // 628 previously used, do not reuse CommandReloadConditions = 629, CommandReloadConfig = 630, CommandReloadBattlegroundTemplate = 631, @@ -617,7 +580,7 @@ namespace Framework.Constants CommandReloadSpellThreats = 702, CommandReloadSpellGroupStackRules = 703, CommandReloadCypherString = 704, - CommandReloadWardenAction = 705, + // 705 previously used, do not reuse CommandReloadWaypointScripts = 706, CommandReloadWaypointData = 707, CommandReloadVehicleAccesory = 708, @@ -688,9 +651,9 @@ namespace Framework.Constants CommandWpReload = 773, CommandWpShow = 774, CommandModifyCurrency = 775, - CommandDebugPhase = 776, + // 776 previously used, do not reuse CommandMailbox = 777, - CommandAhbot = 778, + // 778 previously used, do not reuse CommandAhbotItems = 779, CommandAhbotItemsGray = 780, CommandAhbotItemsWhite = 781, @@ -747,8 +710,7 @@ namespace Framework.Constants CommandTicketResetComplaint = 832, CommandTicketResetSuggestion = 833, // = 834, // DEPRECATED: DON'T REUSE - CommandDebugLoadcells = 835, - CommandDebugBoundary = 836, + // 835-836 previously used, do not reuse CommandNpcEvade = 837, CommandPetLevel = 838, CommandServerShutdownForce = 839, @@ -764,10 +726,9 @@ namespace Framework.Constants CommandListScenes = 849, CommandReloadSceneTemplate = 850, CommandReloadAreatriggerTemplate = 851, - CommandDebugDummy = 852, + // 852 previously used, do not reuse CommandReloadConversationTemplate = 853, - CommandDebugConversation = 854, - CommandDebugPlayMusic = 855, + // 854-855 previously used, do not reuse CommandNpcSpawngroup = 856, CommandNpcDespawngroup = 857, CommandGobjectSpawngroup = 858, @@ -781,17 +742,15 @@ namespace Framework.Constants CommandListSpawnpoints = 866, CommandReloadQuestGreetingLocale = 867, // Reserved CommandModifyPower = 868, - CommandDebugSendPlayerChoice = 869, - CommandDebugThreatinfo = 870, - CommandDebugInstancespawn = 871, + // 869 previously used, do not reuse + // 870-871 previously used, do not reuse CommandServerDebug = 872, CommandReloadCreatureMovementOverride = 873, - // = 874, // DEPRECATED: DON'T REUSE + // 874 previously used, do not reuse CommandLookupMapId = 875, CommandLookupItemId = 876, CommandLookupQuestId = 877, - CommandDebugQuestreset = 878, - // 879 previously used, do not reuse + // 878-879 previously used, do not reuse CommandPdumpCopy = 880, CommandReloadVehicleTemplate = 881, // Custom Permissions 1000+ diff --git a/Source/Framework/Constants/Language.cs b/Source/Framework/Constants/Language.cs index a3bd6528b..2dbba8725 100644 --- a/Source/Framework/Constants/Language.cs +++ b/Source/Framework/Constants/Language.cs @@ -984,6 +984,25 @@ namespace Framework.Constants DisallowTicketsConfig = 1218, // 1219-1499 - free + CmdparserEither = 1500, + CmdparserOr = 1501, + CmdparserStringValueInvalid = 1502, + CmdparserInvalidUtf8 = 1503, + CmdparserLinkdataInvalid = 1504, + CmdparserAccountNameNoExist = 1505, + CmdparserAccountIdNoExist = 1506, + CmdparserCharGuidNoExist = 1507, + CmdparserCharNameNoExist = 1508, + CmdparserCharNameInvalid = 1509, + CmdparserAchievementNoExist = 1510, + CmdparserGameTeleIdNoExist = 1511, + CmdparserGameTeleNoExist = 1512, + CmdparserItemNoExist = 1513, + CmdparserSpellNoExist = 1514, + CmdparserExactSeqMismatch = 1515, + CmdparserCurrencyNoExist = 1516, + + // 1516-1998 - free DebugAreatriggerLeft = 1999, // Ticket Strings 2003-2028 CommandTicketclosed = 2003, diff --git a/Source/Framework/Database/Databases/WorldDatabase.cs b/Source/Framework/Database/Databases/WorldDatabase.cs index 685698ca3..a3f3162cd 100644 --- a/Source/Framework/Database/Databases/WorldDatabase.cs +++ b/Source/Framework/Database/Databases/WorldDatabase.cs @@ -74,7 +74,7 @@ namespace Framework.Database PrepareStatement(WorldStatements.UPD_WAYPOINT_SCRIPT_O, "UPDATE waypoint_scripts SET o = ? WHERE guid = ?"); PrepareStatement(WorldStatements.SEL_WAYPOINT_SCRIPT_ID_BY_GUID, "SELECT id FROM waypoint_scripts WHERE guid = ?"); PrepareStatement(WorldStatements.DEL_CREATURE, "DELETE FROM creature WHERE guid = ?"); - PrepareStatement(WorldStatements.SEL_COMMANDS, "SELECT name, permission, help FROM command"); + PrepareStatement(WorldStatements.SEL_COMMANDS, "SELECT name, help FROM command"); PrepareStatement(WorldStatements.SEL_CREATURE_TEMPLATE, "SELECT entry, difficulty_entry_1, difficulty_entry_2, difficulty_entry_3, KillCredit1, KillCredit2, name, femaleName, subname, TitleAlt, IconName, gossip_menu_id, minlevel, maxlevel, HealthScalingExpansion, RequiredExpansion, VignetteID, faction, npcflag, speed_walk, speed_run, scale, `rank`, dmgschool, BaseAttackTime, RangeAttackTime, BaseVariance, RangeVariance, unit_class, unit_flags, unit_flags2, unit_flags3, dynamicflags, family, trainer_class, type, type_flags, type_flags2, lootid, pickpocketloot, skinloot, VehicleId, mingold, maxgold, AIName, MovementType, ctm.Ground, ctm.Swim, ctm.Flight, ctm.Rooted, ctm.Chase, ctm.Random, ctm.InteractionPauseTimer, HoverHeight, HealthModifier, HealthModifierExtra, ManaModifier, ManaModifierExtra, ArmorModifier, DamageModifier, ExperienceModifier, RacialLeader, movementId, CreatureDifficultyID, WidgetSetID, WidgetSetUnitConditionID, RegenHealth, mechanic_immune_mask, spell_school_immune_mask, flags_extra, ScriptName FROM creature_template ct LEFT JOIN creature_template_movement ctm ON ct.entry = ctm.CreatureId WHERE entry = ? OR 1 = ?"); PrepareStatement(WorldStatements.SEL_WAYPOINT_SCRIPT_BY_ID, "SELECT guid, delay, command, datalong, datalong2, dataint, x, y, z, o FROM waypoint_scripts WHERE id = ?"); PrepareStatement(WorldStatements.SEL_CREATURE_BY_ID, "SELECT guid FROM creature WHERE id = ?"); diff --git a/Source/Game/Chat/CommandArgs.cs b/Source/Game/Chat/CommandArgs.cs index ec7bfb301..d6972907f 100644 --- a/Source/Game/Chat/CommandArgs.cs +++ b/Source/Game/Chat/CommandArgs.cs @@ -61,12 +61,12 @@ namespace Game.Chat { value = default; - if (Hyperlink.TryParse(out value, type, args)) - return true; - if (args.IsAtEnd()) return false; + if (Hyperlink.TryParse(out value, type, args)) + return true; + if (type.IsEnum) type = type.GetEnumUnderlyingType(); @@ -269,6 +269,5 @@ namespace Game.Chat return null; } - } } diff --git a/Source/Game/Chat/CommandAttribute.cs b/Source/Game/Chat/CommandAttribute.cs index 7f34e1dc5..15adfcecb 100644 --- a/Source/Game/Chat/CommandAttribute.cs +++ b/Source/Game/Chat/CommandAttribute.cs @@ -55,7 +55,8 @@ namespace Game.Chat [AttributeUsage(AttributeTargets.Class)] public class CommandGroupAttribute : CommandAttribute { - public CommandGroupAttribute(string command, RBACPermissions rbac, bool allowConsole = false) : base(command, rbac, allowConsole) { } + //todo fix me. + public CommandGroupAttribute(string command) : base(command, RBACPermissions.Max, true) { } } [AttributeUsage(AttributeTargets.Method)] diff --git a/Source/Game/Chat/CommandHandler.cs b/Source/Game/Chat/CommandHandler.cs index 056e9ce4b..23d65bcfb 100644 --- a/Source/Game/Chat/CommandHandler.cs +++ b/Source/Game/Chat/CommandHandler.cs @@ -692,6 +692,7 @@ namespace Game.Chat return true; } + public bool IsConsole() { return _session == null; } public WorldSession GetSession() { return _session; diff --git a/Source/Game/Chat/CommandManager.cs b/Source/Game/Chat/CommandManager.cs index a81e64df6..99cf92e01 100644 --- a/Source/Game/Chat/CommandManager.cs +++ b/Source/Game/Chat/CommandManager.cs @@ -60,7 +60,7 @@ namespace Game.Chat do { string name = result.Read(0); - SetDataForCommandInTable(GetCommands(), name, result.Read(1), result.Read(2), name); + SetDataForCommandInTable(GetCommands(), name, result.Read(1), name); } while (result.NextRow()); } @@ -94,7 +94,7 @@ namespace Game.Chat command.SortChildCommands(); } - static bool SetDataForCommandInTable(ICollection table, string text, uint permission, string help, string fullcommand) + static bool SetDataForCommandInTable(ICollection 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; } diff --git a/Source/Game/Chat/Commands/AccountCommands.cs b/Source/Game/Chat/Commands/AccountCommands.cs index 2dcbd7b93..943742e57 100644 --- a/Source/Game/Chat/Commands/AccountCommands.cs +++ b/Source/Game/Chat/Commands/AccountCommands.cs @@ -22,7 +22,7 @@ using System; namespace Game.Chat { - [CommandGroup("account", RBACPermissions.CommandAccount, true)] + [CommandGroup("account")] class AccountCommands { [Command("", RBACPermissions.CommandAccount)] @@ -322,7 +322,7 @@ namespace Game.Chat return true; } - [CommandGroup("set", RBACPermissions.CommandAccountSet, true)] + [CommandGroup("set")] class SetCommands { [Command("addon", RBACPermissions.CommandAccountSetAddon, true)] @@ -495,7 +495,7 @@ namespace Game.Chat return true; } - [CommandGroup("sec", RBACPermissions.CommandAccountSetSec, true)] + [CommandGroup("sec")] class SetSecCommands { [Command("email", RBACPermissions.CommandAccountSetSecEmail, true)] @@ -584,7 +584,7 @@ namespace Game.Chat } } - [CommandGroup("lock", RBACPermissions.CommandAccountLock)] + [CommandGroup("lock")] class LockCommands { [Command("country", RBACPermissions.CommandAccountLockCountry)] diff --git a/Source/Game/Chat/Commands/AchievementCommands.cs b/Source/Game/Chat/Commands/AchievementCommands.cs index 1ee1f7b7d..e3e3ac5ca 100644 --- a/Source/Game/Chat/Commands/AchievementCommands.cs +++ b/Source/Game/Chat/Commands/AchievementCommands.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; namespace Game.Chat.Commands { - [CommandGroup("achievement", RBACPermissions.CommandAchievement)] + [CommandGroup("achievement")] class AchievementCommand { [Command("add", RBACPermissions.CommandAchievementAdd)] diff --git a/Source/Game/Chat/Commands/AhBotCommands.cs b/Source/Game/Chat/Commands/AhBotCommands.cs index 178ef67ef..65cfa2047 100644 --- a/Source/Game/Chat/Commands/AhBotCommands.cs +++ b/Source/Game/Chat/Commands/AhBotCommands.cs @@ -21,7 +21,7 @@ using Framework.IO; namespace Game.Chat.Commands { //Holder for now. - [CommandGroup("ahbot", RBACPermissions.CommandAhbot)] + [CommandGroup("ahbot")] class AhBotCommands { [Command("rebuild", RBACPermissions.CommandAhbotRebuild, true)] @@ -113,7 +113,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("items", RBACPermissions.CommandAhbotItems)] + [CommandGroup("items")] class ItemsCommands { [Command("", RBACPermissions.CommandAhbotItems, true)] @@ -174,7 +174,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("ratio", RBACPermissions.CommandAhbotRatio)] + [CommandGroup("ratio")] class RatioCommands { [Command("", RBACPermissions.CommandAhbotRatio, true)] diff --git a/Source/Game/Chat/Commands/ArenaCommands.cs b/Source/Game/Chat/Commands/ArenaCommands.cs index 217bbb663..06ef82dd1 100644 --- a/Source/Game/Chat/Commands/ArenaCommands.cs +++ b/Source/Game/Chat/Commands/ArenaCommands.cs @@ -21,7 +21,7 @@ using System; namespace Game.Chat { - [CommandGroup("arena", RBACPermissions.CommandArena)] + [CommandGroup("arena")] class ArenaCommands { [Command("create", RBACPermissions.CommandArenaCreate, true)] diff --git a/Source/Game/Chat/Commands/BNetAccountCommands.cs b/Source/Game/Chat/Commands/BNetAccountCommands.cs index b347b5adb..d50b8ed7a 100644 --- a/Source/Game/Chat/Commands/BNetAccountCommands.cs +++ b/Source/Game/Chat/Commands/BNetAccountCommands.cs @@ -22,7 +22,7 @@ using System; namespace Game.Chat.Commands { - [CommandGroup("bnetaccount", RBACPermissions.CommandBnetAccount, true)] + [CommandGroup("bnetaccount")] class BNetAccountCommands { [Command("create", RBACPermissions.CommandBnetAccountCreate, true)] @@ -273,7 +273,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("lock", RBACPermissions.CommandBnetAccount, true)] + [CommandGroup("lock")] class LockCommands { [Command("country", RBACPermissions.CommandBnetAccountLockCountry, true)] @@ -360,7 +360,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("set", RBACPermissions.CommandBnetAccountSet, true)] + [CommandGroup("set")] class SetCommands { [Command("password", RBACPermissions.CommandBnetAccountSetPassword, true)] diff --git a/Source/Game/Chat/Commands/BanCommands.cs b/Source/Game/Chat/Commands/BanCommands.cs index 2d3b51dd0..a4ca343a3 100644 --- a/Source/Game/Chat/Commands/BanCommands.cs +++ b/Source/Game/Chat/Commands/BanCommands.cs @@ -24,7 +24,7 @@ using System.Net; namespace Game.Chat.Commands { - [CommandGroup("ban", RBACPermissions.CommandBan, true)] + [CommandGroup("ban")] class BanCommands { [Command("account", RBACPermissions.CommandBanAccount, true)] @@ -182,7 +182,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("baninfo", RBACPermissions.CommandBaninfo, true)] + [CommandGroup("baninfo")] class BanInfoCommands { [Command("account", RBACPermissions.CommandBaninfoAccount, true)] @@ -311,7 +311,7 @@ namespace Game.Chat.Commands } - [CommandGroup("banlist", RBACPermissions.CommandBanlist, true)] + [CommandGroup("banlist")] class BanListCommands { [Command("account", RBACPermissions.CommandBanlistAccount, true)] @@ -591,7 +591,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("unban", RBACPermissions.CommandUnban, true)] + [CommandGroup("unban")] class UnBanCommands { [Command("account", RBACPermissions.CommandUnbanAccount, true)] diff --git a/Source/Game/Chat/Commands/BattleFieldCommands.cs b/Source/Game/Chat/Commands/BattleFieldCommands.cs index 1dfbf4421..9101ac9b6 100644 --- a/Source/Game/Chat/Commands/BattleFieldCommands.cs +++ b/Source/Game/Chat/Commands/BattleFieldCommands.cs @@ -21,7 +21,7 @@ using Game.BattleFields; namespace Game.Chat { - [CommandGroup("bf", RBACPermissions.CommandBf)] + [CommandGroup("bf")] class BattleFieldCommands { [Command("enable", RBACPermissions.CommandBfEnable)] diff --git a/Source/Game/Chat/Commands/CastCommands.cs b/Source/Game/Chat/Commands/CastCommands.cs index 1b41977e1..77faa4457 100644 --- a/Source/Game/Chat/Commands/CastCommands.cs +++ b/Source/Game/Chat/Commands/CastCommands.cs @@ -23,7 +23,7 @@ using System; namespace Game.Chat { - [CommandGroup("cast", RBACPermissions.CommandCast)] + [CommandGroup("cast")] class CastCommands { [Command("", RBACPermissions.CommandCast)] diff --git a/Source/Game/Chat/Commands/CharacterCommands.cs b/Source/Game/Chat/Commands/CharacterCommands.cs index babfb9184..3e76d7369 100644 --- a/Source/Game/Chat/Commands/CharacterCommands.cs +++ b/Source/Game/Chat/Commands/CharacterCommands.cs @@ -27,7 +27,7 @@ using System.Text; namespace Game.Chat { - [CommandGroup("character", RBACPermissions.CommandCharacter, true)] + [CommandGroup("character")] class CharacterCommands { [Command("titles", RBACPermissions.CommandCharacterTitles, true)] @@ -448,7 +448,7 @@ namespace Game.Chat return true; } - [CommandGroup("deleted", RBACPermissions.CommandCharacterDeleted, true)] + [CommandGroup("deleted")] class DeletedCommands { [Command("delete", RBACPermissions.CommandCharacterDeletedDelete, true)] @@ -729,7 +729,7 @@ namespace Game.Chat } } - [CommandGroup("pdump", RBACPermissions.CommandPdump, true)] + [CommandGroup("pdump")] class PdumpCommand { [Command("load", RBACPermissions.CommandPdumpLoad, true)] diff --git a/Source/Game/Chat/Commands/CheatCommands.cs b/Source/Game/Chat/Commands/CheatCommands.cs index 131929d26..fbec5cb50 100644 --- a/Source/Game/Chat/Commands/CheatCommands.cs +++ b/Source/Game/Chat/Commands/CheatCommands.cs @@ -21,7 +21,7 @@ using Game.Entities; namespace Game.Chat.Commands { - [CommandGroup("cheat", RBACPermissions.CommandCheat)] + [CommandGroup("cheat")] class CheatCommands { [Command("casttime", RBACPermissions.CommandCheatCasttime)] diff --git a/Source/Game/Chat/Commands/DebugCommands.cs b/Source/Game/Chat/Commands/DebugCommands.cs index fce531f9c..30d94bac7 100644 --- a/Source/Game/Chat/Commands/DebugCommands.cs +++ b/Source/Game/Chat/Commands/DebugCommands.cs @@ -32,10 +32,10 @@ using System.Text; namespace Game.Chat { - [CommandGroup("debug", RBACPermissions.CommandDebug, true)] + [CommandGroup("debug")] class DebugCommands { - [Command("anim", RBACPermissions.CommandDebugAnim)] + [Command("anim", RBACPermissions.CommandDebug)] static bool HandleDebugAnimCommand(CommandHandler handler, Emote emote) { Unit unit = handler.GetSelectedUnit(); @@ -46,7 +46,7 @@ namespace Game.Chat return true; } - [Command("areatriggers", RBACPermissions.CommandDebugAreatriggers)] + [Command("areatriggers", RBACPermissions.CommandDebug)] static bool HandleDebugAreaTriggersCommand(CommandHandler handler) { Player player = handler.GetPlayer(); @@ -63,21 +63,21 @@ namespace Game.Chat return true; } - [Command("arena", RBACPermissions.CommandDebugArena, true)] + [Command("arena", RBACPermissions.CommandDebug, true)] static bool HandleDebugArenaCommand(CommandHandler handler) { Global.BattlegroundMgr.ToggleArenaTesting(); return true; } - [Command("bg", RBACPermissions.CommandDebugBg, true)] + [Command("bg", RBACPermissions.CommandDebug, true)] static bool HandleDebugBattlegroundCommand(CommandHandler handler) { Global.BattlegroundMgr.ToggleTesting(); return true; } - [Command("boundary", RBACPermissions.CommandDebugBoundary)] + [Command("boundary", RBACPermissions.CommandDebug)] static bool HandleDebugBoundaryCommand(CommandHandler handler, string fill, uint durationArg) { Player player = handler.GetPlayer(); @@ -99,7 +99,7 @@ namespace Game.Chat return true; } - [Command("combat", RBACPermissions.CommandDebugCombat)] + [Command("combat", RBACPermissions.CommandDebug)] static bool HandleDebugCombatListCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); @@ -121,7 +121,7 @@ namespace Game.Chat return true; } - [Command("conversation", RBACPermissions.CommandDebugConversation)] + [Command("conversation", RBACPermissions.CommandDebug)] static bool HandleDebugConversationCommand(CommandHandler handler, uint conversationEntry) { Player target = handler.GetSelectedPlayerOrSelf(); @@ -134,14 +134,14 @@ namespace Game.Chat return Conversation.CreateConversation(conversationEntry, target, target, target.GetGUID()) != null; } - [Command("dummy", RBACPermissions.CommandDebugDummy)] + [Command("dummy", RBACPermissions.CommandDebug)] static bool HandleDebugDummyCommand(CommandHandler handler) { handler.SendSysMessage("This command does nothing right now. Edit your local core (DebugCommands.cs) to make it do whatever you need for testing."); return true; } - [Command("entervehicle", RBACPermissions.CommandDebugEntervehicle)] + [Command("entervehicle", RBACPermissions.CommandDebug)] static bool HandleDebugEnterVehicleCommand(CommandHandler handler, uint entry, sbyte seatId = -1) { Unit target = handler.GetSelectedUnit(); @@ -165,7 +165,7 @@ namespace Game.Chat return true; } - [Command("getitemstate", RBACPermissions.CommandDebugGetitemstate)] + [Command("getitemstate", RBACPermissions.CommandDebug)] static bool HandleDebugGetItemStateCommand(CommandHandler handler, string itemState) { ItemUpdateState state = ItemUpdateState.Unchanged; @@ -452,7 +452,7 @@ namespace Game.Chat return true; } - [Command("instancespawn", RBACPermissions.CommandDebugInstancespawn)] + [Command("instancespawn", RBACPermissions.CommandDebug)] static bool HandleDebugInstanceSpawns(CommandHandler handler, string optArg) { Player player = handler.GetPlayer(); @@ -559,7 +559,7 @@ namespace Game.Chat return true; } - [Command("itemexpire", RBACPermissions.CommandDebugItemexpire)] + [Command("itemexpire", RBACPermissions.CommandDebug)] static bool HandleDebugItemExpireCommand(CommandHandler handler, ulong guid) { Item item = handler.GetPlayer().GetItemByGuid(ObjectGuid.Create(HighGuid.Item, guid)); @@ -572,7 +572,7 @@ namespace Game.Chat return true; } - [Command("loadcells", RBACPermissions.CommandDebugLoadcells)] + [Command("loadcells", RBACPermissions.CommandDebug)] static bool HandleDebugLoadCellsCommand(CommandHandler handler, uint mapId = 0xFFFFFFFF) { Player player = handler.GetPlayer(); @@ -592,7 +592,7 @@ namespace Game.Chat return true; } - [Command("lootrecipient", RBACPermissions.CommandDebugLootrecipient)] + [Command("lootrecipient", RBACPermissions.CommandDebug)] static bool HandleDebugGetLootRecipientCommand(CommandHandler handler) { Creature target = handler.GetSelectedCreature(); @@ -604,7 +604,7 @@ namespace Game.Chat return true; } - [Command("los", RBACPermissions.CommandDebugLos)] + [Command("los", RBACPermissions.CommandDebug)] static bool HandleDebugLoSCommand(CommandHandler handler) { Unit unit = handler.GetSelectedUnit(); @@ -620,7 +620,7 @@ namespace Game.Chat return false; } - [Command("moveflags", RBACPermissions.CommandDebugMoveflags)] + [Command("moveflags", RBACPermissions.CommandDebug)] static bool HandleDebugMoveflagsCommand(CommandHandler handler, uint? moveFlags, uint? moveFlagsExtra) { Unit target = handler.GetSelectedUnit(); @@ -656,7 +656,7 @@ namespace Game.Chat return true; } - [Command("neargraveyard", RBACPermissions.CommandNearGraveyard)] + [Command("neargraveyard", RBACPermissions.CommandDebug)] static bool HandleDebugNearGraveyard(CommandHandler handler, string linked) { Player player = handler.GetPlayer(); @@ -740,7 +740,7 @@ namespace Game.Chat return true; } - [Command("phase", RBACPermissions.CommandDebugPhase)] + [Command("phase", RBACPermissions.CommandDebug)] static bool HandleDebugPhaseCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); @@ -759,7 +759,7 @@ namespace Game.Chat return true; } - [Command("questreset", RBACPermissions.CommandDebugQuestreset)] + [Command("questreset", RBACPermissions.CommandDebug)] static bool HandleDebugQuestResetCommand(CommandHandler handler, string arg) { bool daily = false, weekly = false, monthly = false; @@ -794,7 +794,7 @@ namespace Game.Chat return true; } - [Command("raidreset", RBACPermissions.CommandInstanceUnbind)] + [Command("raidreset", RBACPermissions.CommandDebug)] static bool HandleDebugRaidResetCommand(CommandHandler handler, uint mapId, uint difficulty) { MapRecord mEntry = CliDB.MapStorage.LookupByKey(mapId); @@ -847,7 +847,7 @@ namespace Game.Chat return true; } - [Command("setaurastate", RBACPermissions.CommandDebugSetaurastate)] + [Command("setaurastate", RBACPermissions.CommandDebug)] static bool HandleDebugSetAuraStateCommand(CommandHandler handler, AuraStateType? state, bool apply) { Unit unit = handler.GetSelectedUnit(); @@ -869,7 +869,7 @@ namespace Game.Chat return true; } - [Command("spawnvehicle", RBACPermissions.CommandDebugSpawnvehicle)] + [Command("spawnvehicle", RBACPermissions.CommandDebug)] static bool HandleDebugSpawnVehicleCommand(CommandHandler handler, uint entry, uint id) { float x, y, z, o = handler.GetPlayer().GetOrientation(); @@ -897,7 +897,7 @@ namespace Game.Chat return true; } - [Command("threat", RBACPermissions.CommandDebugThreat)] + [Command("threat", RBACPermissions.CommandDebug)] static bool HandleDebugThreatListCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); @@ -957,7 +957,7 @@ namespace Game.Chat return true; } - [Command("threatinfo", RBACPermissions.CommandDebugThreatinfo)] + [Command("threatinfo", RBACPermissions.CommandDebug)] static bool HandleDebugThreatInfoCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); @@ -1033,7 +1033,7 @@ namespace Game.Chat return true; } - [Command("transport", RBACPermissions.CommandDebugTransport)] + [Command("transport", RBACPermissions.CommandDebug)] static bool HandleDebugTransportCommand(CommandHandler handler, string operation) { Transport transport = handler.GetPlayer().GetTransport(); @@ -1060,7 +1060,7 @@ namespace Game.Chat return true; } - [Command("worldstate", RBACPermissions.CommandDebugWorldState)] + [Command("worldstate", RBACPermissions.CommandDebug)] static bool HandleDebugUpdateWorldStateCommand(CommandHandler handler, uint variable, uint value) { handler.GetPlayer().SendUpdateWorldState(variable, value); @@ -1088,7 +1088,7 @@ namespace Game.Chat return true; } - [CommandNonGroup("wpgps", RBACPermissions.CommandWpgps)] + [CommandNonGroup("wpgps", RBACPermissions.CommandDebug)] static bool HandleWPGPSCommand(CommandHandler handler) { Player player = handler.GetPlayer(); @@ -1121,10 +1121,10 @@ namespace Game.Chat return true; } - [CommandGroup("play", RBACPermissions.CommandDebugPlay)] + [CommandGroup("play")] class PlayCommands { - [Command("cinematic", RBACPermissions.CommandDebugPlayCinematic)] + [Command("cinematic", RBACPermissions.CommandDebug)] static bool HandleDebugPlayCinematicCommand(CommandHandler handler, uint cinematicId) { CinematicSequencesRecord cineSeq = CliDB.CinematicSequencesStorage.LookupByKey(cinematicId); @@ -1152,7 +1152,7 @@ namespace Game.Chat return true; } - [Command("movie", RBACPermissions.CommandDebugPlayMovie)] + [Command("movie", RBACPermissions.CommandDebug)] static bool HandleDebugPlayMovieCommand(CommandHandler handler, uint movieId) { if (!CliDB.MovieStorage.ContainsKey(movieId)) @@ -1165,7 +1165,7 @@ namespace Game.Chat return true; } - [Command("music", RBACPermissions.CommandDebugPlayMusic)] + [Command("music", RBACPermissions.CommandDebug)] static bool HandleDebugPlayMusicCommand(CommandHandler handler, uint musicId) { if (!CliDB.SoundKitStorage.ContainsKey(musicId)) @@ -1182,7 +1182,7 @@ namespace Game.Chat return true; } - [Command("sound", RBACPermissions.CommandDebugPlaySound)] + [Command("sound", RBACPermissions.CommandDebug)] static bool HandleDebugPlaySoundCommand(CommandHandler handler, uint soundId, uint broadcastTextId) { if (!CliDB.SoundKitStorage.ContainsKey(soundId)) @@ -1210,7 +1210,7 @@ namespace Game.Chat } } - [CommandGroup("pvp", RBACPermissions.CommandDebug)] + [CommandGroup("pvp")] class PvpCommands { [Command("warmode", RBACPermissions.CommandDebug)] @@ -1245,17 +1245,17 @@ namespace Game.Chat } - [CommandGroup("send", RBACPermissions.CommandDebugSend)] + [CommandGroup("send")] class SendCommands { - [Command("buyerror", RBACPermissions.CommandDebugSendBuyerror)] + [Command("buyerror", RBACPermissions.CommandDebug)] static bool HandleDebugSendBuyErrorCommand(CommandHandler handler, BuyResult error) { handler.GetPlayer().SendBuyError(error, null, 0); return true; } - [Command("channelnotify", RBACPermissions.CommandDebugSendChannelnotify)] + [Command("channelnotify", RBACPermissions.CommandDebug)] static bool HandleDebugSendChannelNotifyCommand(CommandHandler handler, ChatNotify type) { ChannelNotify packet = new(); @@ -1265,7 +1265,7 @@ namespace Game.Chat return true; } - [Command("chatmessage", RBACPermissions.CommandDebugSendChatmessage)] + [Command("chatmessage", RBACPermissions.CommandDebug)] static bool HandleDebugSendChatMsgCommand(CommandHandler handler, ChatMsg type) { ChatPkt data = new(); @@ -1274,14 +1274,14 @@ namespace Game.Chat return true; } - [Command("equiperror", RBACPermissions.CommandDebugSendEquiperror)] + [Command("equiperror", RBACPermissions.CommandDebug)] static bool HandleDebugSendEquipErrorCommand(CommandHandler handler, InventoryResult error) { handler.GetPlayer().SendEquipError(error); return true; } - [Command("largepacket", RBACPermissions.CommandDebugSendLargepacket)] + [Command("largepacket", RBACPermissions.CommandDebug)] static bool HandleDebugSendLargePacketCommand(CommandHandler handler) { StringBuilder ss = new(); @@ -1291,14 +1291,14 @@ namespace Game.Chat return true; } - [Command("opcode", RBACPermissions.CommandDebugSendOpcode)] + [Command("opcode", RBACPermissions.CommandDebug)] static bool HandleDebugSendOpcodeCommand(CommandHandler handler) { handler.SendSysMessage(CypherStrings.NoCmd); return true; } - [Command("playerchoice", RBACPermissions.CommandDebugSendPlayerChoice)] + [Command("playerchoice", RBACPermissions.CommandDebug)] static bool HandleDebugSendPlayerChoiceCommand(CommandHandler handler, int choiceId) { Player player = handler.GetPlayer(); @@ -1306,28 +1306,28 @@ namespace Game.Chat return true; } - [Command("qpartymsg", RBACPermissions.CommandDebugSendQpartymsg)] + [Command("qpartymsg", RBACPermissions.CommandDebug)] static bool HandleDebugSendQuestPartyMsgCommand(CommandHandler handler, QuestPushReason msg) { handler.GetPlayer().SendPushToPartyResponse(handler.GetPlayer(), msg); return true; } - [Command("qinvalidmsg", RBACPermissions.CommandDebugSendQinvalidmsg)] + [Command("qinvalidmsg", RBACPermissions.CommandDebug)] static bool HandleDebugSendQuestInvalidMsgCommand(CommandHandler handler, QuestFailedReasons msg) { handler.GetPlayer().SendCanTakeQuestResponse(msg); return true; } - [Command("sellerror", RBACPermissions.CommandDebugSendSellerror)] + [Command("sellerror", RBACPermissions.CommandDebug)] static bool HandleDebugSendSellErrorCommand(CommandHandler handler, SellResult error) { handler.GetPlayer().SendSellError(error, null, ObjectGuid.Empty); return true; } - [Command("setphaseshift", RBACPermissions.CommandDebugSendSetphaseshift)] + [Command("setphaseshift", RBACPermissions.CommandDebug)] static bool HandleDebugSendSetPhaseShiftCommand(CommandHandler handler, uint phaseId, uint visibleMapId, uint uiMapPhaseId) { PhaseShift phaseShift = new(); @@ -1345,7 +1345,7 @@ namespace Game.Chat return true; } - [Command("spellfail", RBACPermissions.CommandDebugSendSpellfail)] + [Command("spellfail", RBACPermissions.CommandDebug)] static bool HandleDebugSendSpellFailCommand(CommandHandler handler, SpellCastResult result, int? failArg1, int? failArg2) { CastFailed castFailed = new(); diff --git a/Source/Game/Chat/Commands/DeserterCommands.cs b/Source/Game/Chat/Commands/DeserterCommands.cs index 3b776b140..f7fa37a39 100644 --- a/Source/Game/Chat/Commands/DeserterCommands.cs +++ b/Source/Game/Chat/Commands/DeserterCommands.cs @@ -28,10 +28,10 @@ namespace Game.Chat.Commands public const uint BGDeserter = 26013; } - [CommandGroup("deserter", RBACPermissions.CommandDeserter)] + [CommandGroup("deserter")] class DeserterCommands { - [CommandGroup("instance", RBACPermissions.CommandDeserterInstance)] + [CommandGroup("instance")] class DeserterInstanceCommands { [Command("add", RBACPermissions.CommandDeserterInstanceAdd)] @@ -47,7 +47,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("bg", RBACPermissions.CommandDeserterBg)] + [CommandGroup("bg")] class DeserterBGCommands { [Command("add", RBACPermissions.CommandDeserterBgAdd)] diff --git a/Source/Game/Chat/Commands/DisableCommands.cs b/Source/Game/Chat/Commands/DisableCommands.cs index cec17b4aa..f5f904085 100644 --- a/Source/Game/Chat/Commands/DisableCommands.cs +++ b/Source/Game/Chat/Commands/DisableCommands.cs @@ -22,10 +22,10 @@ using Game.DataStorage; namespace Game.Chat.Commands { - [CommandGroup("disable", RBACPermissions.CommandDisable)] + [CommandGroup("disable")] class DisableCommands { - [CommandGroup("add", RBACPermissions.CommandDisableAdd, true)] + [CommandGroup("add")] class DisableAddCommands { static bool HandleAddDisables(StringArguments args, CommandHandler handler, DisableType disableType) @@ -222,7 +222,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("remove", RBACPermissions.CommandDisableRemove, true)] + [CommandGroup("remove")] class DisableRemoveCommands { static bool HandleRemoveDisables(StringArguments args, CommandHandler handler, DisableType disableType) diff --git a/Source/Game/Chat/Commands/EventCommands.cs b/Source/Game/Chat/Commands/EventCommands.cs index 7c5b327ee..41369e688 100644 --- a/Source/Game/Chat/Commands/EventCommands.cs +++ b/Source/Game/Chat/Commands/EventCommands.cs @@ -20,10 +20,10 @@ using Framework.IO; namespace Game.Chat { - [CommandGroup("event", RBACPermissions.CommandEvent)] + [CommandGroup("event")] class EventCommands { - [Command("info", RBACPermissions.CommandEvent, true)] + [Command("info", RBACPermissions.CommandEventInfo, true)] static bool HandleEventInfoCommand(CommandHandler handler, ushort eventId) { var events = Global.GameEventMgr.GetEventMap(); diff --git a/Source/Game/Chat/Commands/GMCommands.cs b/Source/Game/Chat/Commands/GMCommands.cs index f48efb7f7..2073e688f 100644 --- a/Source/Game/Chat/Commands/GMCommands.cs +++ b/Source/Game/Chat/Commands/GMCommands.cs @@ -22,36 +22,9 @@ using Game.Entities; namespace Game.Chat { - [CommandGroup("gm", RBACPermissions.CommandGm)] + [CommandGroup("gm")] class GMCommands { - [Command("", RBACPermissions.CommandGm)] - static bool HandleGMCommand(CommandHandler handler, bool? enableArg) - { - Player _player = handler.GetSession().GetPlayer(); - - if (!enableArg.HasValue) - { - handler.SendNotification(_player.IsGameMaster() ? CypherStrings.GmOn : CypherStrings.GmOff); - return true; - } - - if (enableArg.Value) - { - _player.SetGameMaster(true); - handler.SendNotification(CypherStrings.GmOn); - _player.UpdateTriggerVisibility(); - } - else - { - _player.SetGameMaster(false); - handler.SendNotification(CypherStrings.GmOff); - _player.UpdateTriggerVisibility(); - } - - return true; - } - [Command("chat", RBACPermissions.CommandGmChat)] static bool HandleGMChatCommand(CommandHandler handler, bool? enableArg) { @@ -182,6 +155,24 @@ namespace Game.Chat return true; } + [Command("off", RBACPermissions.CommandGm)] + static bool HandleGMOffCommand(CommandHandler handler) + { + handler.GetPlayer().SetGameMaster(false); + handler.GetPlayer().UpdateTriggerVisibility(); + handler.GetSession().SendNotification(CypherStrings.GmOff); + return true; + } + + [Command("on", RBACPermissions.CommandGm)] + static bool HandleGMOnCommand(CommandHandler handler) + { + handler.GetPlayer().SetGameMaster(true); + handler.GetPlayer().UpdateTriggerVisibility(); + handler.GetSession().SendNotification(CypherStrings.GmOn); + return true; + } + [Command("visible", RBACPermissions.CommandGmVisible)] static bool HandleGMVisibleCommand(CommandHandler handler, bool? visibleArg) { diff --git a/Source/Game/Chat/Commands/GameObjectCommands.cs b/Source/Game/Chat/Commands/GameObjectCommands.cs index 63bfdb900..55d98350d 100644 --- a/Source/Game/Chat/Commands/GameObjectCommands.cs +++ b/Source/Game/Chat/Commands/GameObjectCommands.cs @@ -28,7 +28,7 @@ using System.Text; namespace Game.Chat { - [CommandGroup("gobject", RBACPermissions.CommandGobject)] + [CommandGroup("gobject")] class GameObjectCommands { [Command("activate", RBACPermissions.CommandGobjectActivate)] @@ -478,7 +478,7 @@ namespace Game.Chat return true; } - [CommandGroup("add", RBACPermissions.CommandGobjectAdd)] + [CommandGroup("add")] class AddCommands { [Command("", RBACPermissions.CommandGobjectAdd)] @@ -548,7 +548,7 @@ namespace Game.Chat } } - [CommandGroup("set", RBACPermissions.CommandGobjectSet)] + [CommandGroup("set")] class SetCommands { [Command("phase", RBACPermissions.CommandGobjectSetPhase)] diff --git a/Source/Game/Chat/Commands/GoCommands.cs b/Source/Game/Chat/Commands/GoCommands.cs index 548fbd864..d0f65ce2c 100644 --- a/Source/Game/Chat/Commands/GoCommands.cs +++ b/Source/Game/Chat/Commands/GoCommands.cs @@ -27,7 +27,7 @@ using System.Linq; namespace Game.Chat.Commands { - [CommandGroup("go", RBACPermissions.CommandGo)] + [CommandGroup("go")] class GoCommands { [Command("areatrigger", RBACPermissions.CommandGo)] @@ -497,7 +497,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("creature", RBACPermissions.CommandGo)] + [CommandGroup("creature")] class GoCommandCreature { [Command("", RBACPermissions.CommandGo)] @@ -541,7 +541,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("gameobject", RBACPermissions.CommandGo)] + [CommandGroup("gameobject")] class GoCommandGameobject { [Command("", RBACPermissions.CommandGo)] diff --git a/Source/Game/Chat/Commands/GroupCommands.cs b/Source/Game/Chat/Commands/GroupCommands.cs index 247f26854..c59281820 100644 --- a/Source/Game/Chat/Commands/GroupCommands.cs +++ b/Source/Game/Chat/Commands/GroupCommands.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; namespace Game.Chat { - [CommandGroup("group", RBACPermissions.CommandGroup)] + [CommandGroup("group")] class GroupCommands { // Summon group of player @@ -343,7 +343,7 @@ namespace Game.Chat return true; } - [CommandGroup("set", RBACPermissions.CommandGroupSet)] + [CommandGroup("set")] class GroupSetCommands { [Command("assistant", RBACPermissions.CommandGroupAssistant)] diff --git a/Source/Game/Chat/Commands/GuildCommands.cs b/Source/Game/Chat/Commands/GuildCommands.cs index e49a45cf6..5afa12e71 100644 --- a/Source/Game/Chat/Commands/GuildCommands.cs +++ b/Source/Game/Chat/Commands/GuildCommands.cs @@ -22,7 +22,7 @@ using Game.Guilds; namespace Game.Chat { - [CommandGroup("guild", RBACPermissions.CommandGuild, true)] + [CommandGroup("guild")] class GuildCommands { [Command("create", RBACPermissions.CommandGuildCreate, true)] diff --git a/Source/Game/Chat/Commands/HonorCommands.cs b/Source/Game/Chat/Commands/HonorCommands.cs index 0d2a9623f..4b0a11fd1 100644 --- a/Source/Game/Chat/Commands/HonorCommands.cs +++ b/Source/Game/Chat/Commands/HonorCommands.cs @@ -21,7 +21,7 @@ using Game.Entities; namespace Game.Chat.Commands { - [CommandGroup("honor", RBACPermissions.CommandHonor)] + [CommandGroup("honor")] class HonorCommands { [Command("update", RBACPermissions.CommandHonorUpdate)] @@ -42,7 +42,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("add", RBACPermissions.CommandHonorAdd)] + [CommandGroup("add")] class HonorAddCommands { [Command("", RBACPermissions.CommandHonorAdd)] diff --git a/Source/Game/Chat/Commands/InstanceCommands.cs b/Source/Game/Chat/Commands/InstanceCommands.cs index 405afba92..556619d61 100644 --- a/Source/Game/Chat/Commands/InstanceCommands.cs +++ b/Source/Game/Chat/Commands/InstanceCommands.cs @@ -24,7 +24,7 @@ using Game.DataStorage; namespace Game.Chat { - [CommandGroup("instance", RBACPermissions.CommandInstance, true)] + [CommandGroup("instance")] class InstanceCommands { [Command("listbinds", RBACPermissions.CommandInstanceListbinds)] diff --git a/Source/Game/Chat/Commands/LFGCommands.cs b/Source/Game/Chat/Commands/LFGCommands.cs index 9535adc68..795ca3493 100644 --- a/Source/Game/Chat/Commands/LFGCommands.cs +++ b/Source/Game/Chat/Commands/LFGCommands.cs @@ -17,7 +17,6 @@ using Framework.Constants; using Framework.Database; -using Framework.IO; using Game.DungeonFinding; using Game.Entities; using Game.Groups; @@ -25,7 +24,7 @@ using System; namespace Game.Chat { - [CommandGroup("lfg", RBACPermissions.CommandLfg, true)] + [CommandGroup("lfg")] class LFGCommands { [Command("player", RBACPermissions.CommandLfgPlayer, true)] diff --git a/Source/Game/Chat/Commands/LearnCommands.cs b/Source/Game/Chat/Commands/LearnCommands.cs index a2992d682..f086303e7 100644 --- a/Source/Game/Chat/Commands/LearnCommands.cs +++ b/Source/Game/Chat/Commands/LearnCommands.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; namespace Game.Chat.Commands { - [CommandGroup("learn", RBACPermissions.CommandLearn)] + [CommandGroup("learn")] class LearnCommands { [Command("", RBACPermissions.CommandLearn)] @@ -72,7 +72,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("all", RBACPermissions.CommandLearnAll)] + [CommandGroup("all")] class LearnAllCommands { [Command("gm", RBACPermissions.CommandLearnAllGm)] @@ -239,7 +239,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("my", RBACPermissions.CommandLearnAllMy)] + [CommandGroup("my")] class LearnAllMyCommands { [Command("class", RBACPermissions.CommandLearnAllMyClass)] diff --git a/Source/Game/Chat/Commands/ListCommands.cs b/Source/Game/Chat/Commands/ListCommands.cs index da7d54e23..b2bc06f3d 100644 --- a/Source/Game/Chat/Commands/ListCommands.cs +++ b/Source/Game/Chat/Commands/ListCommands.cs @@ -26,7 +26,7 @@ using System.Collections.Generic; namespace Game.Chat.Commands { - [CommandGroup("list", RBACPermissions.CommandList, true)] + [CommandGroup("list")] class ListCommands { [Command("auras", RBACPermissions.CommandListAuras)] diff --git a/Source/Game/Chat/Commands/LookupCommands.cs b/Source/Game/Chat/Commands/LookupCommands.cs index 3aa3eacb7..30c99b955 100644 --- a/Source/Game/Chat/Commands/LookupCommands.cs +++ b/Source/Game/Chat/Commands/LookupCommands.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; namespace Game.Chat { - [CommandGroup("lookup", RBACPermissions.CommandLookup, true)] + [CommandGroup("lookup")] class LookupCommands { static int maxResults = 50; @@ -643,7 +643,7 @@ namespace Game.Chat return true; } - [CommandGroup("item", RBACPermissions.CommandLookupItem, true)] + [CommandGroup("item")] class ItemCommandGroup { [Command("", RBACPermissions.CommandLookupItem, true)] @@ -710,7 +710,7 @@ namespace Game.Chat } } - [CommandGroup("map", RBACPermissions.CommandLookupMap, true)] + [CommandGroup("map")] class MapCommandGroup { [Command("", RBACPermissions.CommandLookupMap, true)] @@ -833,7 +833,7 @@ namespace Game.Chat } } - [CommandGroup("player", RBACPermissions.CommandLookupPlayer, true)] + [CommandGroup("player")] class PlayerCommandGroup { [Command("ip", RBACPermissions.CommandLookupPlayerIp)] @@ -921,7 +921,7 @@ namespace Game.Chat } } - [CommandGroup("quest", RBACPermissions.CommandLookupQuest, true)] + [CommandGroup("quest")] class QuestCommandGroup { [Command("", RBACPermissions.CommandLookupQuest, true)] @@ -1133,7 +1133,7 @@ namespace Game.Chat } } - [CommandGroup("spell",RBACPermissions.CommandLookupSpell)] + [CommandGroup("spell")] class SpellCommandGroup { [Command("", RBACPermissions.CommandLookupSpell)] diff --git a/Source/Game/Chat/Commands/MMapsCommands.cs b/Source/Game/Chat/Commands/MMapsCommands.cs index d69546a63..79c0caafb 100644 --- a/Source/Game/Chat/Commands/MMapsCommands.cs +++ b/Source/Game/Chat/Commands/MMapsCommands.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; namespace Game.Chat { - [CommandGroup("mmap", RBACPermissions.CommandMmap, true)] + [CommandGroup("mmap")] class MMapsCommands { [Command("path", RBACPermissions.CommandMmapPath)] diff --git a/Source/Game/Chat/Commands/MessageCommands.cs b/Source/Game/Chat/Commands/MessageCommands.cs index 327d3794f..32f70848b 100644 --- a/Source/Game/Chat/Commands/MessageCommands.cs +++ b/Source/Game/Chat/Commands/MessageCommands.cs @@ -131,10 +131,10 @@ namespace Game.Chat } } - [CommandGroup("channel", RBACPermissions.CommandChannel, true)] + [CommandGroup("channel")] class ChannelCommands { - [CommandGroup("set", RBACPermissions.CommandChannelSet, true)] + [CommandGroup("set")] class ChannelSetCommands { [Command("ownership", RBACPermissions.CommandChannelSetOwnership)] diff --git a/Source/Game/Chat/Commands/ModifyCommands.cs b/Source/Game/Chat/Commands/ModifyCommands.cs index 8868fefa4..96b6225d5 100644 --- a/Source/Game/Chat/Commands/ModifyCommands.cs +++ b/Source/Game/Chat/Commands/ModifyCommands.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; namespace Game.Chat { - [CommandGroup("modify", RBACPermissions.CommandModify)] + [CommandGroup("modify")] class ModifyCommand { [Command("hp", RBACPermissions.CommandModifyHp)] @@ -740,7 +740,7 @@ namespace Game.Chat return true; } - [CommandGroup("speed", RBACPermissions.CommandModifySpeed)] + [CommandGroup("speed")] class ModifySpeed { [Command("", RBACPermissions.CommandModifySpeed)] diff --git a/Source/Game/Chat/Commands/NPCCommands.cs b/Source/Game/Chat/Commands/NPCCommands.cs index 5cdd512bb..1060c2ad5 100644 --- a/Source/Game/Chat/Commands/NPCCommands.cs +++ b/Source/Game/Chat/Commands/NPCCommands.cs @@ -30,7 +30,7 @@ using Game.Loots; namespace Game.Chat { - [CommandGroup("npc", RBACPermissions.CommandNpc)] + [CommandGroup("npc")] class NPCCommands { [Command("despawngroup", RBACPermissions.CommandNpcDespawngroup)] @@ -572,7 +572,7 @@ namespace Game.Chat } } - [CommandGroup("add", RBACPermissions.CommandNpcAdd)] + [CommandGroup("add")] class AddCommands { [Command("", RBACPermissions.CommandNpcAdd)] @@ -763,7 +763,7 @@ namespace Game.Chat } } - [CommandGroup("delete", RBACPermissions.CommandNpcDelete)] + [CommandGroup("delete")] class DeleteCommands { [Command("", RBACPermissions.CommandNpcDelete)] @@ -826,7 +826,7 @@ namespace Game.Chat } } - [CommandGroup("follow", RBACPermissions.CommandNpcFollow)] + [CommandGroup("follow")] class FollowCommands { [Command("", RBACPermissions.CommandNpcFollow)] @@ -882,7 +882,7 @@ namespace Game.Chat } } - [CommandGroup("set", RBACPermissions.CommandNpcSet, true)] + [CommandGroup("set")] class SetCommands { [Command("allowmove", RBACPermissions.CommandNpcSetAllowmove)] diff --git a/Source/Game/Chat/Commands/PetCommands.cs b/Source/Game/Chat/Commands/PetCommands.cs index de6504b8c..ac3e56d65 100644 --- a/Source/Game/Chat/Commands/PetCommands.cs +++ b/Source/Game/Chat/Commands/PetCommands.cs @@ -22,7 +22,7 @@ using Game.Spells; namespace Game.Chat { - [CommandGroup("pet", RBACPermissions.CommandPet)] + [CommandGroup("pet")] class PetCommands { [Command("create", RBACPermissions.CommandPetCreate)] diff --git a/Source/Game/Chat/Commands/QuestCommands.cs b/Source/Game/Chat/Commands/QuestCommands.cs index 497e08a7b..4b9af8972 100644 --- a/Source/Game/Chat/Commands/QuestCommands.cs +++ b/Source/Game/Chat/Commands/QuestCommands.cs @@ -24,7 +24,7 @@ using System.Linq; namespace Game.Chat { - [CommandGroup("quest", RBACPermissions.CommandQuest)] + [CommandGroup("quest")] class QuestCommands { [Command("add", RBACPermissions.CommandQuestAdd)] diff --git a/Source/Game/Chat/Commands/RbacCommands.cs b/Source/Game/Chat/Commands/RbacCommands.cs index 009aed3b3..ab4ce0b14 100644 --- a/Source/Game/Chat/Commands/RbacCommands.cs +++ b/Source/Game/Chat/Commands/RbacCommands.cs @@ -23,7 +23,7 @@ using System.Collections.Generic; namespace Game.Chat.Commands { - [CommandGroup("rbac", RBACPermissions.CommandRbac, true)] + [CommandGroup("rbac")] class RbacComands { [Command("list", RBACPermissions.CommandRbacList, true)] @@ -62,7 +62,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("account", RBACPermissions.CommandRbacAcc, true)] + [CommandGroup("account")] class RbacAccountCommands { [Command("grant", RBACPermissions.CommandRbacAccPermGrant, true)] diff --git a/Source/Game/Chat/Commands/ReloadCommand.cs b/Source/Game/Chat/Commands/ReloadCommand.cs index ccc860035..cd52fc8c0 100644 --- a/Source/Game/Chat/Commands/ReloadCommand.cs +++ b/Source/Game/Chat/Commands/ReloadCommand.cs @@ -24,7 +24,7 @@ using Game.Spells; namespace Game.Chat { - [CommandGroup("reload", RBACPermissions.CommandReload, true)] + [CommandGroup("reload")] class ReloadCommand { [Command("access_requirement", RBACPermissions.CommandReloadAccessRequirement, true)] @@ -118,9 +118,6 @@ namespace Game.Chat return true; } - [Command("command", RBACPermissions.CommandReloadCommand, true)] - static bool HandleReloadCommandCommand(CommandHandler handler, StringArguments args) { return true; } - [Command("conditions", RBACPermissions.CommandReloadConditions, true)] static bool HandleReloadConditions(CommandHandler handler, StringArguments args) { @@ -921,21 +918,6 @@ namespace Game.Chat return true; } - [Command("warden_action", RBACPermissions.CommandReloadWardenAction, true)] - static bool HandleReloadWardenactionCommand(CommandHandler handler, StringArguments args) - { - if (!WorldConfig.GetBoolValue(WorldCfg.WardenEnabled)) - { - handler.SendSysMessage("Warden system disabled by config - reloading warden_action skipped."); - return false; - } - - //Log.outInfo(LogFilter.Misc, "Re-Loading warden_action Table!"); - //Global.WardenCheckMgr.LoadWardenOverrides(); - //handler.SendGlobalGMSysMessage("DB table `warden_action` reloaded."); - return true; - } - [Command("waypoint_data", RBACPermissions.CommandReloadWaypointData, true)] static bool HandleReloadWpCommand(CommandHandler handler, StringArguments args) { @@ -970,7 +952,7 @@ namespace Game.Chat return true; } - [CommandGroup("all", RBACPermissions.CommandReloadAll, true)] + [CommandGroup("all")] class AllCommand { [Command("", RBACPermissions.CommandReloadAll, true)] diff --git a/Source/Game/Chat/Commands/ResetCommands.cs b/Source/Game/Chat/Commands/ResetCommands.cs index 68f9d9073..65b9850db 100644 --- a/Source/Game/Chat/Commands/ResetCommands.cs +++ b/Source/Game/Chat/Commands/ResetCommands.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; namespace Game.Chat { - [CommandGroup("reset", RBACPermissions.CommandReset, true)] + [CommandGroup("reset")] class ResetCommands { [Command("achievements", RBACPermissions.CommandResetAchievements, true)] diff --git a/Source/Game/Chat/Commands/SceneCommands.cs b/Source/Game/Chat/Commands/SceneCommands.cs index 441cf890d..dcf141cc2 100644 --- a/Source/Game/Chat/Commands/SceneCommands.cs +++ b/Source/Game/Chat/Commands/SceneCommands.cs @@ -22,7 +22,7 @@ using Game.Entities; namespace Game.Chat { - [CommandGroup("scene", RBACPermissions.CommandScene)] + [CommandGroup("scene")] class SceneCommands { [Command("cancel", RBACPermissions.CommandSceneCancel)] diff --git a/Source/Game/Chat/Commands/SendCommands.cs b/Source/Game/Chat/Commands/SendCommands.cs index 3c9a901ea..2a59a00e8 100644 --- a/Source/Game/Chat/Commands/SendCommands.cs +++ b/Source/Game/Chat/Commands/SendCommands.cs @@ -24,7 +24,7 @@ using System.Collections.Generic; namespace Game.Chat.Commands { - [CommandGroup("send", RBACPermissions.CommandSend, false)] + [CommandGroup("send")] class SendCommands { [Command("mail", RBACPermissions.CommandSendMail, true)] diff --git a/Source/Game/Chat/Commands/ServerCommands.cs b/Source/Game/Chat/Commands/ServerCommands.cs index ab3e4505b..f0c8b4f79 100644 --- a/Source/Game/Chat/Commands/ServerCommands.cs +++ b/Source/Game/Chat/Commands/ServerCommands.cs @@ -22,7 +22,7 @@ using System; namespace Game.Chat { - [CommandGroup("server", RBACPermissions.CommandServer, true)] + [CommandGroup("server")] class ServerCommands { [Command("corpses", RBACPermissions.CommandServerCorpses, true)] @@ -230,7 +230,7 @@ namespace Game.Chat return true; } - [CommandGroup("idleRestart", RBACPermissions.CommandServerIdlerestart, true)] + [CommandGroup("idleRestart")] class IdleRestartCommands { [Command("", RBACPermissions.CommandServerIdlerestart, true)] @@ -249,7 +249,7 @@ namespace Game.Chat } } - [CommandGroup("idleshutdown", RBACPermissions.CommandServerIdleshutdown, true)] + [CommandGroup("idleshutdown")] class IdleshutdownCommands { [Command("", RBACPermissions.CommandServerIdleshutdown, true)] @@ -269,7 +269,7 @@ namespace Game.Chat } } - [CommandGroup("restart", RBACPermissions.CommandServerInfo, true)] + [CommandGroup("restart")] class RestartCommands { [Command("", RBACPermissions.CommandServerRestart, true)] @@ -295,7 +295,7 @@ namespace Game.Chat } } - [CommandGroup("shutdown", RBACPermissions.CommandServerMotd, true)] + [CommandGroup("shutdown")] class ShutdownCommands { [Command("", RBACPermissions.CommandServerShutdown, true)] @@ -321,7 +321,7 @@ namespace Game.Chat } } - [CommandGroup("set", RBACPermissions.CommandServerSet, true)] + [CommandGroup("set")] class SetCommands { [Command("difftime", RBACPermissions.CommandServerSetDifftime, true)] diff --git a/Source/Game/Chat/Commands/TeleCommands.cs b/Source/Game/Chat/Commands/TeleCommands.cs index 3621a0b8d..f6802056c 100644 --- a/Source/Game/Chat/Commands/TeleCommands.cs +++ b/Source/Game/Chat/Commands/TeleCommands.cs @@ -26,7 +26,7 @@ using System.Collections.Generic; namespace Game.Chat { - [CommandGroup("tele", RBACPermissions.CommandTele)] + [CommandGroup("tele")] class TeleCommands { [Command("", RBACPermissions.CommandTele)] diff --git a/Source/Game/Chat/Commands/TicketCommands.cs b/Source/Game/Chat/Commands/TicketCommands.cs index 49b0d33fe..0c0a6f323 100644 --- a/Source/Game/Chat/Commands/TicketCommands.cs +++ b/Source/Game/Chat/Commands/TicketCommands.cs @@ -22,7 +22,7 @@ using Game.SupportSystem; namespace Game.Chat.Commands { - [CommandGroup("ticket", RBACPermissions.CommandTicket, true)] + [CommandGroup("ticket")] class TicketCommands { [Command("togglesystem", RBACPermissions.CommandTicketTogglesystem, true)] @@ -40,7 +40,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("bug", RBACPermissions.CommandTicketBug, true)] + [CommandGroup("bug")] class TicketBugCommands { [Command("assign", RBACPermissions.CommandTicketBugAssign, true)] @@ -92,7 +92,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("complaint", RBACPermissions.CommandTicketComplaint, true)] + [CommandGroup("complaint")] class TicketComplaintCommands { [Command("assign", RBACPermissions.CommandTicketComplaintAssign, true)] @@ -144,7 +144,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("suggestion", RBACPermissions.CommandTicketSuggestion, true)] + [CommandGroup("suggestion")] class TicketSuggestionCommands { [Command("assign", RBACPermissions.CommandTicketSuggestionAssign, true)] @@ -196,7 +196,7 @@ namespace Game.Chat.Commands } } - [CommandGroup("reset", RBACPermissions.CommandTicketReset, true)] + [CommandGroup("reset")] class TicketResetCommands { [Command("all", RBACPermissions.CommandTicketResetAll, true)] diff --git a/Source/Game/Chat/Commands/TitleCommands.cs b/Source/Game/Chat/Commands/TitleCommands.cs index e98de81d6..30987c750 100644 --- a/Source/Game/Chat/Commands/TitleCommands.cs +++ b/Source/Game/Chat/Commands/TitleCommands.cs @@ -24,7 +24,7 @@ using System; namespace Game.Chat.Commands { - [CommandGroup("titles", RBACPermissions.CommandTitles)] + [CommandGroup("titles")] class TitleCommands { [Command("current", RBACPermissions.CommandTitlesCurrent)] @@ -159,7 +159,7 @@ namespace Game.Chat.Commands return true; } - [CommandGroup("set", RBACPermissions.CommandTitlesSet)] + [CommandGroup("set")] class TitleSetCommands { //Edit Player KnownTitles diff --git a/Source/Game/Chat/Commands/WPCommands.cs b/Source/Game/Chat/Commands/WPCommands.cs index 76b78890e..10ab75771 100644 --- a/Source/Game/Chat/Commands/WPCommands.cs +++ b/Source/Game/Chat/Commands/WPCommands.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; namespace Game.Chat.Commands { - [CommandGroup("wp", RBACPermissions.CommandWp)] + [CommandGroup("wp")] class WPCommands { [Command("add", RBACPermissions.CommandWpAdd)]