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

Chat/Commands: Eradicate ChatHandler::extractOptFirstArg

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/42be7836dfacd9e8d6b0c2b5d5f230ed6a55f088)
This commit is contained in:
hondacrx
2022-06-08 15:49:43 -04:00
parent f54dd5bba1
commit e6db88fa14
5 changed files with 65 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/GuildCommands.cs
+7 -15
View File
@@ -128,20 +128,15 @@ namespace Game.Chat
}
[Command("rank", RBACPermissions.CommandGuildRank, true)]
static bool HandleGuildRankCommand(CommandHandler handler, StringArguments args)
static bool HandleGuildRankCommand(CommandHandler handler, string playerName, byte rank)
{
string nameStr;
string rankStr;
handler.ExtractOptFirstArg(args, out nameStr, out rankStr);
if (string.IsNullOrEmpty(rankStr))
var player = PlayerIdentifier.ParseFromString(playerName);
if (player == null)
player = PlayerIdentifier.FromTargetOrSelf(handler);
if (player == null)
return false;
Player target;
ObjectGuid targetGuid;
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out _))
return false;
ulong guildId = target ? target.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(targetGuid);
ulong guildId = player.IsConnected() ? player.GetConnectedPlayer().GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(player.GetGUID());
if (guildId == 0)
return false;
@@ -149,10 +144,7 @@ namespace Game.Chat
if (!targetGuild)
return false;
if (!byte.TryParse(rankStr, out byte newRank))
return false;
return targetGuild.ChangeMemberRank(null, targetGuid, (GuildRankId)newRank);
return targetGuild.ChangeMemberRank(null, player.GetGUID(), (GuildRankId)rank);
}
[Command("rename", RBACPermissions.CommandGuildRename, true)]