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

More refactoring of code.

Browse Source
This commit is contained in:
hondacrx
2019-09-23 21:41:13 -04:00
parent 2418715800
commit 570aebce26
176 changed files with 2261 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/GuildCommands.cs
+11 -11
View File
@@ -32,10 +32,10 @@ namespace Game.Chat
return false;
Player target;
if (!handler.extractPlayerTarget(args[0] != '"' ? args : null, out target))
if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target))
return false;
string guildname = handler.extractQuotedArg(args.NextString());
string guildname = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildname))
return false;
@@ -60,7 +60,7 @@ namespace Game.Chat
[Command("delete", RBACPermissions.CommandGuildDelete, true)]
static bool HandleGuildDeleteCommand(StringArguments args, CommandHandler handler)
{
string guildName = handler.extractQuotedArg(args.NextString());
string guildName = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildName))
return false;
@@ -79,10 +79,10 @@ namespace Game.Chat
return false;
Player target;
if (!handler.extractPlayerTarget(args[0] != '"' ? args : null, out target))
if (!handler.ExtractPlayerTarget(args[0] != '"' ? args : null, out target))
return false;
string guildName = handler.extractQuotedArg(args.NextString());
string guildName = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(guildName))
return false;
@@ -100,7 +100,7 @@ namespace Game.Chat
{
Player target;
ObjectGuid targetGuid = ObjectGuid.Empty;
if (!handler.extractPlayerTarget(args, out target, out targetGuid))
if (!handler.ExtractPlayerTarget(args, out target, out targetGuid))
return false;
ulong guildId = target != null ? target.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(targetGuid);
@@ -120,14 +120,14 @@ namespace Game.Chat
{
string nameStr;
string rankStr;
handler.extractOptFirstArg(args, out nameStr, out rankStr);
handler.ExtractOptFirstArg(args, out nameStr, out rankStr);
if (string.IsNullOrEmpty(rankStr))
return false;
Player target;
ObjectGuid targetGuid;
string target_name;
if (!handler.extractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out target_name))
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out target, out targetGuid, out target_name))
return false;
ulong guildId = target ? target.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(targetGuid);
@@ -150,14 +150,14 @@ namespace Game.Chat
if (args.Empty())
return false;
string oldGuildStr = handler.extractQuotedArg(args.NextString());
string oldGuildStr = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(oldGuildStr))
{
handler.SendSysMessage(CypherStrings.BadValue);
return false;
}
string newGuildStr = handler.extractQuotedArg(args.NextString());
string newGuildStr = handler.ExtractQuotedArg(args.NextString());
if (string.IsNullOrEmpty(newGuildStr))
{
handler.SendSysMessage(CypherStrings.InsertGuildName);
@@ -191,7 +191,7 @@ namespace Game.Chat
static bool HandleGuildInfoCommand(StringArguments args, CommandHandler handler)
{
Guild guild = null;
Player target = handler.getSelectedPlayerOrSelf();
Player target = handler.GetSelectedPlayerOrSelf();
if (!args.Empty() && args[0] != '\0')
{