Some cleanups to commands.

This commit is contained in:
hondacrx
2022-06-07 17:49:43 -04:00
parent 22e3faa502
commit 3e0f40be0c
12 changed files with 132 additions and 42 deletions
@@ -27,8 +27,12 @@ namespace Game.Chat.Commands
class AchievementCommand
{
[Command("add", RBACPermissions.CommandAchievementAdd)]
static bool Add(CommandHandler handler, AchievementRecord achievementEntry)
static bool HandleAchievementAddCommand(CommandHandler handler, uint achievemntId)
{
AchievementRecord achievementEntry = CliDB.AchievementStorage.LookupByKey(achievemntId);
if (achievementEntry == null)
return false;
Player target = handler.GetSelectedPlayer();
if (!target)
{
+1 -1
View File
@@ -470,7 +470,7 @@ namespace Game.Chat
bool explain = false;
uint groupID = 0;
if (explainOrGroupId.Equals("explain"))
if (explainOrGroupId.Equals("explain", StringComparison.OrdinalIgnoreCase))
explain = true;
else
groupID = uint.Parse(explainOrGroupId);
@@ -94,7 +94,7 @@ namespace Game.Chat
// Decode arguments
foreach (var variant in opts)
{
if (variant.Equals("removerespawntime"))
if (variant.Equals("removerespawntime", StringComparison.OrdinalIgnoreCase))
deleteRespawnTimes = true;
else
uint.TryParse(variant, out groupId);
@@ -122,7 +122,7 @@ namespace Game.Chat
uint entry;
ulong spawnId = 0;
if (!isGuid.IsEmpty() && isGuid.Equals("guid"))
if (!isGuid.IsEmpty() && isGuid.Equals("guid", StringComparison.OrdinalIgnoreCase))
{
spawnId = data;
spawnData = Global.ObjectMgr.GetGameObjectData(spawnId);
+2 -2
View File
@@ -51,11 +51,11 @@ namespace Game.Chat
string para = args.NextString();
bool useStraightPath = false;
if (para.Equals("true"))
if (para.Equals("true", StringComparison.OrdinalIgnoreCase))
useStraightPath = true;
bool useRaycast = false;
if (para.Equals("line") || para.Equals("ray") || para.Equals("raycast"))
if (para.Equals("line", StringComparison.OrdinalIgnoreCase) || para.Equals("ray", StringComparison.OrdinalIgnoreCase) || para.Equals("raycast", StringComparison.OrdinalIgnoreCase))
useRaycast = true;
// unit locations
+2 -2
View File
@@ -143,7 +143,7 @@ namespace Game.Chat
uint channelId = 0;
foreach (var channelEntry in CliDB.ChatChannelsStorage.Values)
{
if (channelEntry.Name[handler.GetSessionDbcLocale()].Equals(channelName))
if (channelEntry.Name[handler.GetSessionDbcLocale()].Equals(channelName, StringComparison.OrdinalIgnoreCase))
{
channelId = channelEntry.Id;
break;
@@ -153,7 +153,7 @@ namespace Game.Chat
AreaTableRecord zoneEntry = null;
foreach (var entry in CliDB.AreaTableStorage.Values)
{
if (entry.AreaName[handler.GetSessionDbcLocale()].Equals(channelName))
if (entry.AreaName[handler.GetSessionDbcLocale()].Equals(channelName, StringComparison.OrdinalIgnoreCase))
{
zoneEntry = entry;
break;
+4 -4
View File
@@ -1076,9 +1076,9 @@ namespace Game.Chat
Team team;
if (teamArg.IsEmpty())
team = 0;
else if (teamArg.Equals("horde"))
else if (teamArg.Equals("horde", StringComparison.OrdinalIgnoreCase))
team = Team.Horde;
else if (teamArg.Equals("alliance"))
else if (teamArg.Equals("alliance", StringComparison.OrdinalIgnoreCase))
team = Team.Alliance;
else
return false;
@@ -1364,9 +1364,9 @@ namespace Game.Chat
Team team;
if (teamArg.IsEmpty())
team = 0;
else if (teamArg.Equals("horde"))
else if (teamArg.Equals("horde", StringComparison.OrdinalIgnoreCase))
team = Team.Horde;
else if (teamArg.Equals("alliance"))
else if (teamArg.Equals("alliance", StringComparison.OrdinalIgnoreCase))
team = Team.Alliance;
else
return false;
+1 -1
View File
@@ -420,7 +420,7 @@ namespace Game.Chat
if (string.IsNullOrEmpty(rank))
continue;
if (rank.Equals(rankStr))
if (rank.Equals(rankStr, StringComparison.OrdinalIgnoreCase))
break;
if (i == ReputationMgr.ReputationRankThresholds.Length - 1)
+4 -4
View File
@@ -76,7 +76,7 @@ namespace Game.Chat
return false;
}
if (force.Equals("force"))
if (force.Equals("force", StringComparison.OrdinalIgnoreCase))
creatureTarget.ClearUnitState(UnitState.Evade);
creatureTarget.GetAI().EnterEvadeMode(why.GetValueOrDefault(EvadeReason.Other));
@@ -334,7 +334,7 @@ namespace Game.Chat
handler.SendSysMessage(CypherStrings.CommandNpcShowLootHeader, creatureTarget.GetName(), creatureTarget.GetEntry());
handler.SendSysMessage(CypherStrings.CommandNpcShowLootMoney, loot.gold / MoneyConstants.Gold, (loot.gold % MoneyConstants.Gold) / MoneyConstants.Silver, loot.gold % MoneyConstants.Silver);
if (all.Equals("all")) // nonzero from strcmp <. not equal
if (all.Equals("all", StringComparison.OrdinalIgnoreCase)) // nonzero from strcmp <. not equal
{
handler.SendSysMessage(CypherStrings.CommandNpcShowLootLabel, "Standard items", loot.items.Count);
foreach (LootItem item in loot.items)
@@ -745,9 +745,9 @@ namespace Game.Chat
bool loot = false;
if (!lootStr.IsEmpty())
{
if (lootStr.Equals("loot"))
if (lootStr.Equals("loot", StringComparison.OrdinalIgnoreCase))
loot = true;
else if (lootStr.Equals("noloot"))
else if (lootStr.Equals("noloot", StringComparison.OrdinalIgnoreCase))
loot = false;
else
return false;
+2 -2
View File
@@ -364,13 +364,13 @@ namespace Game.Chat
static bool SetClosed(CommandHandler handler, StringArguments args)
{
string arg1 = args.NextString();
if (arg1.Equals("on"))
if (arg1.Equals("on", StringComparison.OrdinalIgnoreCase))
{
handler.SendSysMessage(CypherStrings.WorldClosed);
Global.WorldMgr.SetClosed(true);
return true;
}
else if (arg1.Equals("off"))
else if (arg1.Equals("off", StringComparison.OrdinalIgnoreCase))
{
handler.SendSysMessage(CypherStrings.WorldOpened);
Global.WorldMgr.SetClosed(false);
+1 -1
View File
@@ -191,7 +191,7 @@ namespace Game.Chat
if (!handler.ExtractPlayerTarget(new StringArguments(nameStr), out Player target, out ObjectGuid targetGuid, out string targetName))
return false;
if (teleStr.Equals("$home")) // References target's homebind
if (teleStr.Equals("home", StringComparison.OrdinalIgnoreCase)) // References target's homebind
{
if (target)
target.TeleportTo(target.GetHomebind());