Cleanup & Fixes for .NET 5 (#309)

- [X] Fixes several bugs
- [X] Updates more ordinal issues
- [X] Cleans up the code a bit
- [X] Turns classes static that should have been
- [X] Changes TcpServer.Instances to a HashSet

Bumps release version
This commit is contained in:
Kamron Batman 2020-11-15 10:03:50 -08:00 • committed by GitHub
parent 4ad8811df2
commit 525cda5413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
266 changed files with 1348 additions and 1800 deletions

View file

@ -2,6 +2,7 @@ using System;
namespace Server
{
[AttributeUsage(AttributeTargets.Method)]
public class UsageAttribute : Attribute
{
public UsageAttribute(string usage) => Usage = usage;
@ -9,6 +10,7 @@ namespace Server
public string Usage { get; }
}
[AttributeUsage(AttributeTargets.Method)]
public class DescriptionAttribute : Attribute
{
public DescriptionAttribute(string description) => Description = description;
@ -16,6 +18,7 @@ namespace Server
public string Description { get; }
}
[AttributeUsage(AttributeTargets.Method)]
public class AliasesAttribute : Attribute
{
public AliasesAttribute(params string[] aliases) => Aliases = aliases;

View file

@ -187,8 +187,7 @@ namespace Server.Commands
CommandSystem.Register("Batch", AccessLevel.Counselor, Batch_OnCommand);
}
[Usage("Batch")]
[Description("Allows multiple commands to be run at the same time.")]
[Usage("Batch"), Description("Allows multiple commands to be run at the same time.")]
public static void Batch_OnCommand(CommandEventArgs e)
{
e.Mobile.SendGump(new BatchGump(e.Mobile, new Batch()));
@ -209,7 +208,7 @@ namespace Server.Commands
public void GetDetails(out string command, out string argString, out string[] args)
{
var indexOf = Command.IndexOf(' ');
var indexOf = Command.IndexOf(' ', StringComparison.Ordinal);
if (indexOf >= 0)
{

View file

@ -11,7 +11,7 @@ using Server.Network;
namespace Server.Commands
{
public class Docs
public static class Docs
{
private const int Iron = 0xCCCCDD;
private const int DullCopper = 0xAAAAAA;
@ -109,8 +109,7 @@ namespace Server.Commands
CommandSystem.Register("DocGen", AccessLevel.Administrator, DocGen_OnCommand);
}
[Usage("DocGen")]
[Description("Generates RunUO documentation.")]
[Usage("DocGen"), Description("Generates RunUO documentation.")]
private static void DocGen_OnCommand(CommandEventArgs e)
{
World.Broadcast(0x35, true, "Documentation is being generated, please wait.");
@ -332,7 +331,7 @@ namespace Server.Commands
if (type.IsGenericType)
{
var index = type.Name.IndexOf('`');
var index = type.Name.IndexOf('`', StringComparison.Ordinal);
if (index > 0)
{
@ -346,7 +345,7 @@ namespace Server.Commands
: new StringBuilder($"<a href=\"@directory@{rootType}-T-.html\">{rootType}</a>");
nameBuilder.Append("&lt;");
fnamBuilder.Append("-");
fnamBuilder.Append('-');
linkBuilder.Append("&lt;");
var typeArguments = type.GetGenericArguments();
@ -364,7 +363,7 @@ namespace Server.Commands
var aliasedName = AliasForName(sanitizedName);
nameBuilder.Append(sanitizedName);
fnamBuilder.Append("T");
fnamBuilder.Append('T');
if (DontLink(typeArguments[i]))
{
linkBuilder.Append($"<font color=\"blue\">{aliasedName}</font>");
@ -378,7 +377,7 @@ namespace Server.Commands
}
nameBuilder.Append("&gt;");
fnamBuilder.Append("-");
fnamBuilder.Append('-');
linkBuilder.Append("&gt;");
name = nameBuilder.ToString();
@ -407,7 +406,7 @@ namespace Server.Commands
public static string SanitizeType(string name)
{
var anonymousType = name.Contains("<");
var anonymousType = name.Contains('<', StringComparison.Ordinal);
var sb = new StringBuilder(name);
for (var i = 0; i < ReplaceChars.Length; ++i)
{
@ -466,7 +465,7 @@ namespace Server.Commands
return true;
}
if (type.Namespace.StartsWith("Server"))
if (type.Namespace.StartsWith("Server", StringComparison.Ordinal))
{
return false;
}
@ -489,11 +488,12 @@ namespace Server.Commands
}
var index = 0;
var file = string.Concat(name, ext);
var file = $"{name}{ext}";
while (File.Exists(Path.Combine(root, file)))
{
file = string.Concat(name, ++index, ext);
index++;
file = $"{name}{index}{ext}";
}
return file;
@ -604,7 +604,7 @@ namespace Server.Commands
if (realType?.IsGenericType == true)
{
FormatGeneric(realType, out _, out _, out var linkName);
aliased = linkName.Replace("@directory@", null);
aliased = linkName.Replace("@directory@", null, StringComparison.Ordinal);
}
else
{
@ -621,7 +621,7 @@ namespace Server.Commands
aliased ??= realType?.Name ?? "";
}
return string.Concat(prepend, aliased, append, name);
return $"{prepend}{aliased}{append}{name}";
}
private static bool Document()
@ -1719,7 +1719,7 @@ namespace Server.Commands
{
line = line.Trim();
if (line.Length == 0 || line.StartsWith("#"))
if (line.Length == 0 || line.StartsWith("#", StringComparison.Ordinal))
{
continue;
}
@ -2029,16 +2029,11 @@ namespace Server.Commands
var aliases = attrs.Length == 0 ? null : attrs[0] as AliasesAttribute;
var descString = desc.Description.Replace("<", "&lt;").Replace(">", "&gt;");
var descString = desc.Description
.Replace("<", "&lt;", StringComparison.Ordinal)
.Replace(">", "&gt;", StringComparison.Ordinal);
if (aliases == null)
{
list.Add(new DocCommandEntry(e.AccessLevel, e.Command, null, usage.Usage, descString));
}
else
{
list.Add(new DocCommandEntry(e.AccessLevel, e.Command, aliases.Aliases, usage.Usage, descString));
}
list.Add(new DocCommandEntry(e.AccessLevel, e.Command, aliases?.Aliases, usage.Usage, descString));
}
for (var i = 0; i < TargetCommands.AllCommands.Count; ++i)
@ -2062,7 +2057,9 @@ namespace Server.Commands
aliases[j] = cmds[j + 1];
}
desc = desc.Replace("<", "&lt;").Replace(">", "&gt;");
desc = desc
.Replace("<", "&lt;", StringComparison.Ordinal)
.Replace(">", "&gt;", StringComparison.Ordinal);
if (command.Supports != CommandSupport.Single)
{
@ -2138,7 +2135,9 @@ namespace Server.Commands
aliases[j] = cmds[j + 1];
}
desc = desc.Replace("<", "&lt;").Replace(">", "&gt;");
desc = desc
.Replace("<", "&lt;", StringComparison.Ordinal)
.Replace(">", "&gt;", StringComparison.Ordinal);
list.Add(new DocCommandEntry(command.AccessLevel, cmd, aliases, usage, desc));
}
@ -2237,7 +2236,9 @@ namespace Server.Commands
{
html.Write(
"<td class=\"rentry\"><b>Usage: {0}</b><br>{1}</td>",
usage.Replace("<", "&lt;").Replace(">", "&gt;"),
usage
.Replace("<", "&lt;", StringComparison.Ordinal)
.Replace(">", "&gt;", StringComparison.Ordinal),
desc
);
}
@ -2245,7 +2246,9 @@ namespace Server.Commands
{
html.Write(
"<td class=\"rentry\"><b>Usage: {0}</b><br>Alias{1}: ",
usage.Replace("<", "&lt;").Replace(">", "&gt;"),
usage
.Replace("<", "&lt;", StringComparison.Ordinal)
.Replace(">", "&gt;", StringComparison.Ordinal),
aliases.Length == 1 ? "" : "es"
);
@ -2564,7 +2567,7 @@ namespace Server.Commands
if (ifaceInfo == null)
{
FormatGeneric(iface, out _, out _, out var linkName);
typeHtml.Write($"<!-- DBG-2.1 -->{linkName.Replace("@directory@", null)}");
typeHtml.Write($"<!-- DBG-2.1 -->{linkName.Replace("@directory@", null, StringComparison.Ordinal)}");
}
else
{
@ -2910,7 +2913,7 @@ namespace Server.Commands
public string FileName => m_FileName;
public string TypeName => m_TypeName;
public string LinkName(string dirRoot) => m_LinkName.Replace("@directory@", dirRoot);
public string LinkName(string dirRoot) => m_LinkName.Replace("@directory@", dirRoot, StringComparison.Ordinal);
}
private class SpeechEntry
@ -3009,7 +3012,7 @@ namespace Server.Commands
return Body == e?.Body && BodyType == e.BodyType && Name == e.Name;
}
public override int GetHashCode() => Body.BodyID ^ (int)BodyType ^ Name.GetHashCode();
public override int GetHashCode() => Body.BodyID ^ (int)BodyType ^ Name.GetHashCode(StringComparison.Ordinal);
}
public class BodyEntrySorter : IComparer<BodyEntry>

View file

@ -7,8 +7,7 @@ namespace Server.Commands
CommandSystem.Register("DragEffects", AccessLevel.Developer, DragEffects_OnCommand);
}
[Usage("DragEffects [enable=false]")]
[Description("Enables or disables the item drag and drop effects.")]
[Usage("DragEffects [enable=false]"), Description("Enables or disables the item drag and drop effects.")]
public static void DragEffects_OnCommand(CommandEventArgs e)
{
if (e.Length == 0)

View file

@ -13,8 +13,7 @@ namespace Server.Commands
CommandSystem.Register("DupeInBag", AccessLevel.GameMaster, DupeInBag_OnCommand);
}
[Usage("Dupe [amount]")]
[Description("Dupes a targeted item.")]
[Usage("Dupe [amount]"), Description("Dupes a targeted item.")]
private static void Dupe_OnCommand(CommandEventArgs e)
{
var amount = 1;
@ -27,8 +26,7 @@ namespace Server.Commands
e.Mobile.SendMessage("What do you wish to dupe?");
}
[Usage("DupeInBag <count>")]
[Description("Dupes an item at it's current location (count) number of times.")]
[Usage("DupeInBag <count>"), Description("Dupes an item at it's current location (count) number of times.")]
private static void DupeInBag_OnCommand(CommandEventArgs e)
{
var amount = 1;

View file

@ -4,7 +4,7 @@ using Server.Items;
namespace Server.Commands
{
public class ExportCommand
public static class ExportCommand
{
private const string ExportFile = @"C:\Uo\WorldForge\items.wsc";

View file

@ -12,7 +12,7 @@ using Server.Spells;
namespace Server.Commands.Generic
{
public class TargetCommands
public static class TargetCommands
{
public static List<BaseCommand> AllCommands { get; } = new List<BaseCommand>();
@ -788,7 +788,7 @@ namespace Server.Commands.Generic
var result = Properties.GetValue(e.Mobile, obj, e.GetString(i));
if (result == "Property not found." || result == "Property is write only." ||
result.StartsWith("Getting this property"))
result.StartsWith("Getting this property", StringComparison.Ordinal))
{
LogFailure(result);
}

View file

@ -194,7 +194,7 @@ namespace Server.Commands.Generic
sb.Append(' ');
}
if (args[i].IndexOf(' ') >= 0)
if (args[i].Contains(' ', StringComparison.Ordinal))
{
sb.Append('"');
sb.Append(args[i]);

View file

@ -38,11 +38,8 @@ namespace Server.Commands.Generic
var list = new List<object>();
var addresses = new List<IPAddress>();
var states = TcpServer.Instances;
for (var i = 0; i < states.Count; ++i)
foreach (var ns in TcpServer.Instances)
{
var ns = states[i];
var mob = ns.Mobile;
if (mob != null && !addresses.Contains(ns.Address) && ext.IsValid(mob))

View file

@ -103,22 +103,20 @@ namespace Server.Commands.Generic
return Empty;
}
var index = 0;
var objectType = AssemblyHandler.FindFirstTypeForName(args[offset + index], true);
var objectType = AssemblyHandler.FindFirstTypeForName(args[offset], true);
if (objectType == null)
{
throw new Exception($"No type with that name ({args[offset + index]}) was found.");
throw new Exception($"No type with that name ({args[offset]}) was found.");
}
++index;
var conditions = new List<ICondition[]>();
var current = new List<ICondition>();
current.Add(TypeCondition.Default);
var index = 1;
while (index < size)
{
var cur = args[offset + index];

View file

@ -36,11 +36,8 @@ namespace Server.Commands.Generic
var list = new List<object>();
var states = TcpServer.Instances;
for (var i = 0; i < states.Count; ++i)
foreach (var ns in TcpServer.Instances)
{
var ns = states[i];
var mob = ns.Mobile;
if (mob == null)

View file

@ -17,7 +17,7 @@ using Server.Targets;
namespace Server.Commands
{
public class CommandHandlers
public static class CommandHandlers
{
public static void Initialize()
{
@ -76,8 +76,7 @@ namespace Server.Commands
CommandSystem.Register(command, access, handler);
}
[Usage("SpeedBoost [true|false]")]
[Description("Enables a speed boost for the invoker. Disable with parameters.")]
[Usage("SpeedBoost [true|false]"), Description("Enables a speed boost for the invoker. Disable with parameters.")]
private static void SpeedBoost_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -101,8 +100,7 @@ namespace Server.Commands
}
}
[Usage("Where")]
[Description("Tells the commanding player his coordinates, region, and facet.")]
[Usage("Where"), Description("Tells the commanding player his coordinates, region, and facet.")]
public static void Where_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -132,10 +130,9 @@ namespace Server.Commands
}
}
[Usage("DropHolding")]
[Description(
"Drops the item, if any, that a targeted player is holding. The item is placed into their backpack, or if that's full, at their feet."
)]
[Usage("DropHolding"), Description(
"Drops the item, if any, that a targeted player is holding. The item is placed into their backpack, or if that's full, at their feet."
)]
public static void DropHolding_OnCommand(CommandEventArgs e)
{
e.Mobile.BeginTarget(-1, false, TargetFlags.None, DropHolding_OnTarget);
@ -221,8 +218,8 @@ namespace Server.Commands
}
}
[Usage("ClearFacet")]
[Description("Deletes all items and mobiles in your facet. Players and their inventory will not be deleted.")]
[Usage("ClearFacet"),
Description("Deletes all items and mobiles in your facet. Players and their inventory will not be deleted.")]
public static void ClearFacet_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -282,8 +279,7 @@ namespace Server.Commands
}
}
[Usage("GetFollowers")]
[Description("Teleports all pets of a targeted player to your location.")]
[Usage("GetFollowers"), Description("Teleports all pets of a targeted player to your location.")]
public static void GetFollowers_OnCommand(CommandEventArgs e)
{
e.Mobile.BeginTarget(-1, false, TargetFlags.None, GetFollowers_OnTarget);
@ -376,17 +372,16 @@ namespace Server.Commands
}
}
[Usage("ViewEquip")]
[Description("Lists equipment of a targeted mobile. From the list you can move, delete, or open props.")]
[Usage("ViewEquip"),
Description("Lists equipment of a targeted mobile. From the list you can move, delete, or open props.")]
public static void ViewEquip_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new ViewEqTarget();
}
[Usage("Sound <index> [toAll=true]")]
[Description(
"Plays a sound to players within 12 tiles of you. The (toAll) argument specifies to everyone, or just those who can see you."
)]
[Usage("Sound <index> [toAll=true]"), Description(
"Plays a sound to players within 12 tiles of you. The (toAll) argument specifies to everyone, or just those who can see you."
)]
public static void Sound_OnCommand(CommandEventArgs e)
{
if (e.Length == 1)
@ -433,8 +428,7 @@ namespace Server.Commands
}
}
[Usage("Echo <text>")]
[Description("Relays (text) as a system message.")]
[Usage("Echo <text>"), Description("Relays (text) as a system message.")]
public static void Echo_OnCommand(CommandEventArgs e)
{
var toEcho = e.ArgString.Trim();
@ -449,29 +443,25 @@ namespace Server.Commands
}
}
[Usage("Bank")]
[Description("Opens the bank box of a given target.")]
[Usage("Bank"), Description("Opens the bank box of a given target.")]
public static void Bank_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new BankTarget();
}
[Usage("Client")]
[Description("Opens the client gump menu for a given player.")]
[Usage("Client"), Description("Opens the client gump menu for a given player.")]
private static void Client_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new ClientTarget();
}
[Usage("Move")]
[Description("Repositions a targeted item or mobile.")]
[Usage("Move"), Description("Repositions a targeted item or mobile.")]
private static void Move_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new PickMoveTarget();
}
[Usage("Save")]
[Description("Saves the world.")]
[Usage("Save"), Description("Saves the world.")]
private static void Save_OnCommand(CommandEventArgs e)
{
AutoSave.Save();
@ -494,10 +484,9 @@ namespace Server.Commands
return validMap;
}
[Usage("Go [name | serial | (x y [z]) | (deg min (N | S) deg min (E | W))]")]
[Description(
"With no arguments, this command brings up the go menu. With one argument, (name), you are moved to that regions \"go location.\" Or, if a numerical value is specified for one argument, (serial), you are moved to that object. Two or three arguments, (x y [z]), will move your character to that location. When six arguments are specified, (deg min (N | S) deg min (E | W)), your character will go to an approximate of those sextant coordinates."
)]
[Usage("Go [name | serial | (x y [z]) | (deg min (N | S) deg min (E | W))]"), Description(
"With no arguments, this command brings up the go menu. With one argument, (name), you are moved to that regions \"go location.\" Or, if a numerical value is specified for one argument, (serial), you are moved to that object. Two or three arguments, (x y [z]), will move your character to that location. When six arguments are specified, (deg min (N | S) deg min (E | W)), your character will go to an approximate of those sextant coordinates."
)]
private static void Go_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -707,8 +696,7 @@ namespace Server.Commands
}
}
[Usage("Help")]
[Description("Lists all available commands.")]
[Usage("Help"), Description("Lists all available commands.")]
public static void Help_OnCommand(CommandEventArgs e)
{
var m = e.Mobile;
@ -755,17 +743,13 @@ namespace Server.Commands
}
}
[Usage("SMsg <text>")]
[Aliases("S", "SM")]
[Description("Broadcasts a message to all online staff.")]
[Usage("SMsg <text>"), Aliases("S", "SM"), Description("Broadcasts a message to all online staff.")]
public static void StaffMessage_OnCommand(CommandEventArgs e)
{
BroadcastMessage(AccessLevel.Counselor, e.Mobile.SpeechHue, $"[{e.Mobile.Name}] {e.ArgString}");
}
[Usage("BCast <text>")]
[Aliases("B", "BC")]
[Description("Broadcasts a message to everyone online.")]
[Usage("BCast <text>"), Aliases("B", "BC"), Description("Broadcasts a message to everyone online.")]
public static void BroadcastMessage_OnCommand(CommandEventArgs e)
{
BroadcastMessage(AccessLevel.Player, 0x482, $"Staff message from {e.Mobile.Name}:");
@ -785,9 +769,7 @@ namespace Server.Commands
}
}
[Usage("AutoPageNotify")]
[Aliases("APN")]
[Description("Toggles your auto-page-notify status.")]
[Usage("AutoPageNotify"), Aliases("APN"), Description("Toggles your auto-page-notify status.")]
public static void APN_OnCommand(CommandEventArgs e)
{
var m = e.Mobile;
@ -797,8 +779,8 @@ namespace Server.Commands
m.SendMessage("Your auto-page-notify has been turned {0}.", m.AutoPageNotify ? "on" : "off");
}
[Usage("Animate <action> <frameCount> <repeatCount> <forward> <repeat> <delay>")]
[Description("Makes your character do a specified animation.")]
[Usage("Animate <action> <frameCount> <repeatCount> <forward> <repeat> <delay>"),
Description("Makes your character do a specified animation.")]
public static void Animate_OnCommand(CommandEventArgs e)
{
if (e.Length == 6)
@ -818,8 +800,7 @@ namespace Server.Commands
}
}
[Usage("Cast <name>")]
[Description("Casts a spell by name.")]
[Usage("Cast <name>"), Description("Casts a spell by name.")]
public static void Cast_OnCommand(CommandEventArgs e)
{
if (e.Length == 1)
@ -846,22 +827,19 @@ namespace Server.Commands
}
}
[Usage("Stuck")]
[Description("Opens a menu of towns, used for teleporting stuck mobiles.")]
[Usage("Stuck"), Description("Opens a menu of towns, used for teleporting stuck mobiles.")]
public static void Stuck_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new StuckMenuTarget();
}
[Usage("Light <level>")]
[Description("Set your local lightlevel.")]
[Usage("Light <level>"), Description("Set your local lightlevel.")]
public static void Light_OnCommand(CommandEventArgs e)
{
e.Mobile.LightLevel = e.GetInt32(0);
}
[Usage("Stats")]
[Description("View some stats about the server.")]
[Usage("Stats"), Description("View some stats about the server.")]
public static void Stats_OnCommand(CommandEventArgs e)
{
e.Mobile.SendMessage("Open Connections: {0}", TcpServer.Instances.Count);

View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using Server.Commands.Generic;
@ -8,7 +9,7 @@ using CommandInfoSorter = Server.Commands.Docs.CommandEntrySorter;
namespace Server.Commands
{
public class HelpInfo
public static class HelpInfo
{
public static Dictionary<string, CommandInfo> HelpInfos { get; } = new Dictionary<string, CommandInfo>();
@ -22,10 +23,9 @@ namespace Server.Commands
FillTable();
}
[Usage("HelpInfo [<command>]")]
[Description(
"Gives information on a specified command, or when no argument specified, displays a gump containing all commands"
)]
[Usage("HelpInfo [<command>]"), Description(
"Gives information on a specified command, or when no argument specified, displays a gump containing all commands"
)]
private static void HelpInfo_OnCommand(CommandEventArgs e)
{
if (e.Length > 0)
@ -93,7 +93,9 @@ namespace Server.Commands
var aliases = attrs.Length == 0 ? null : attrs[0] as AliasesAttribute;
var descString = desc.Description.Replace("<", "(").Replace(">", ")");
var descString = desc.Description
.Replace("<", "(", StringComparison.Ordinal)
.Replace(">", ")", StringComparison.Ordinal);
if (aliases == null)
{
@ -137,7 +139,9 @@ namespace Server.Commands
aliases[j] = cmds[j + 1];
}
desc = desc.Replace("<", "(").Replace(">", ")");
desc = desc
.Replace("<", "(", StringComparison.Ordinal)
.Replace(">", ")", StringComparison.Ordinal);
if (command.Supports != CommandSupport.Single)
{
@ -224,7 +228,9 @@ namespace Server.Commands
aliases[j] = cmds[j + 1];
}
desc = desc.Replace("<", ")").Replace(">", ")");
desc = desc
.Replace("<", ")", StringComparison.Ordinal)
.Replace(">", ")", StringComparison.Ordinal);
list.Add(new CommandInfo(command.AccessLevel, cmd, aliases, usage, desc));
@ -406,7 +412,10 @@ namespace Server.Commands
var sb = new StringBuilder();
sb.Append("Usage: ");
sb.Append(info.Usage.Replace("<", "(").Replace(">", ")"));
var usage = info.Usage
.Replace("<", "(", StringComparison.Ordinal)
.Replace(">", ")", StringComparison.Ordinal);
sb.Append(usage);
sb.Append("<BR>");
var aliases = info.Aliases;

View file

@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Globalization;
using Server.Commands.Generic;
using Server.Items;
using Server.Targeting;
@ -43,9 +42,7 @@ namespace Server.Commands
graphics = new List<int>();
foreach (var arg in e.Arguments)
{
var numberStyles = arg.ToLower().StartsWith("0x") ? NumberStyles.HexNumber : NumberStyles.Integer;
if (int.TryParse(arg, numberStyles, CultureInfo.InvariantCulture, out var result))
if (Utility.ToInt32(arg, out var result))
{
graphics.Add(result);
}

View file

@ -5,7 +5,7 @@ using Server.Accounting;
namespace Server.Commands
{
public class CommandLogging
public static class CommandLogging
{
private static readonly char[] m_NotSafe = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' };
public static bool Enabled { get; set; } = true;
@ -44,25 +44,13 @@ namespace Server.Commands
}
}
public static object Format(object o)
{
if (o is Mobile m)
public static object Format(object o) =>
o switch
{
if (m.Account == null)
{
return $"{m} (no account)";
}
return $"{m} ('{m.Account.Username}')";
}
if (o is Item item)
{
return $"0x{item.Serial.Value:X} ({item.GetType().Name})";
}
return o;
}
Mobile m => m.Account == null ? $"{m} (no account)" : $"{m} ('{m.Account.Username}')",
Item item => $"0x{item.Serial.Value:X} ({item.GetType().Name})",
_ => o
};
public static void WriteLine(Mobile from, string format, params object[] args)
{
@ -126,7 +114,7 @@ namespace Server.Commands
for (var i = 0; isSafe && i < m_NotSafe.Length; ++i)
{
isSafe = ip.IndexOf(m_NotSafe[i]) == -1;
isSafe = !ip.Contains(m_NotSafe[i], StringComparison.Ordinal);
}
if (isSafe)

View file

@ -8,7 +8,7 @@ using CPA = Server.CommandPropertyAttribute;
namespace Server.Commands
{
public class Add
public static class Add
{
private static readonly Type m_EntityType = typeof(IEntity);
@ -72,7 +72,7 @@ namespace Server.Commands
sb.AppendFormat("from {0} to {1} in {2}", start, end, from.Map);
}
sb.Append(":");
sb.Append(':');
for (var i = 0; i < args.Length; ++i)
{
@ -300,7 +300,7 @@ namespace Server.Commands
object obj = value;
if (value?.StartsWith("0x") == true)
if (value?.StartsWith("0x", StringComparison.Ordinal) == true)
{
if (IsSignedNumeric(type))
{
@ -670,91 +670,81 @@ namespace Server.Commands
}
}
[Usage("Tile <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("Tile <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
public static void Tile_OnCommand(CommandEventArgs e)
{
Internal_OnCommand(e, false);
}
[Usage("TileRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
[Usage("TileRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
public static void TileRXYZ_OnCommand(CommandEventArgs e)
{
InternalRXYZ_OnCommand(e, false);
}
[Usage("TileXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a given bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("TileXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a given bounding box. Optional constructor parameters. Optional set property list."
)]
public static void TileXYZ_OnCommand(CommandEventArgs e)
{
InternalXYZ_OnCommand(e, false);
}
[Usage("TileZ <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
[Usage("TileZ <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
public static void TileZ_OnCommand(CommandEventArgs e)
{
InternalZ_OnCommand(e, false);
}
[Usage("TileAvg <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name into a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
[Usage("TileAvg <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name into a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
public static void TileAvg_OnCommand(CommandEventArgs e)
{
InternalAvg_OnCommand(e, false);
}
[Usage("Outline <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("Outline <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a targeted bounding box. Optional constructor parameters. Optional set property list."
)]
public static void Outline_OnCommand(CommandEventArgs e)
{
Internal_OnCommand(e, true);
}
[Usage("OutlineRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineRXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a given bounding box, (x, y) parameters are relative to your characters position. Optional constructor parameters. Optional set property list."
)]
public static void OutlineRXYZ_OnCommand(CommandEventArgs e)
{
InternalRXYZ_OnCommand(e, true);
}
[Usage("OutlineXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a given bounding box. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineXYZ <x> <y> <w> <h> <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a given bounding box. Optional constructor parameters. Optional set property list."
)]
public static void OutlineXYZ_OnCommand(CommandEventArgs e)
{
InternalXYZ_OnCommand(e, true);
}
[Usage("OutlineZ <z> <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineZ <z> <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a targeted bounding box at a fixed Z location. Optional constructor parameters. Optional set property list."
)]
public static void OutlineZ_OnCommand(CommandEventArgs e)
{
InternalZ_OnCommand(e, true);
}
[Usage("OutlineAvg <name> [params] [set {<propertyName> <value> ...}]")]
[Description(
"Tiles an item or npc by name around a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
[Usage("OutlineAvg <name> [params] [set {<propertyName> <value> ...}]"), Description(
"Tiles an item or npc by name around a targeted bounding box on the map's average Z elevation. Optional constructor parameters. Optional set property list."
)]
public static void OutlineAvg_OnCommand(CommandEventArgs e)
{
InternalAvg_OnCommand(e, true);

View file

@ -93,10 +93,9 @@ namespace Server.Gumps
CommandSystem.Register("AddMenu", AccessLevel.GameMaster, AddMenu_OnCommand);
}
[Usage("AddMenu [searchString]")]
[Description(
"Opens an add menu, with an optional initial search string. This menu allows you to search for Items or Mobiles and add them interactively."
)]
[Usage("AddMenu [searchString]"), Description(
"Opens an add menu, with an optional initial search string. This menu allows you to search for Items or Mobiles and add them interactively."
)]
private static void AddMenu_OnCommand(CommandEventArgs e)
{
var val = e.ArgString.Trim();
@ -135,7 +134,7 @@ namespace Server.Gumps
var t = types[i];
if ((typeofMobile.IsAssignableFrom(t) || typeofItem.IsAssignableFrom(t)) &&
t.Name.ToLower().IndexOf(match, StringComparison.Ordinal) >= 0 && !results.Contains(t))
t.Name.ToLower().Contains(match, StringComparison.Ordinal) && !results.Contains(t))
{
var ctors = t.GetConstructors();

View file

@ -48,8 +48,7 @@ namespace Server.Commands
CommandSystem.Register("RebuildCategorization", AccessLevel.Administrator, RebuildCategorization_OnCommand);
}
[Usage("RebuildCategorization")]
[Description("Rebuilds the categorization data file used by the Add command.")]
[Usage("RebuildCategorization"), Description("Rebuilds the categorization data file used by the Add command.")]
public static void RebuildCategorization_OnCommand(CommandEventArgs e)
{
var root = new CategoryEntry(null, "Add Menu", new[] { Items, Mobiles });
@ -305,7 +304,7 @@ namespace Server.Commands
var text = lines[index].Text;
var start = text.IndexOf('(');
var start = text.IndexOf('(', StringComparison.Ordinal);
if (start < 0)
{

View file

@ -20,8 +20,7 @@ namespace Server.Commands
CommandSystem.Register("Decorate", AccessLevel.Administrator, Decorate_OnCommand);
}
[Usage("Decorate")]
[Description("Generates world decoration.")]
[Usage("Decorate"), Description("Generates world decoration.")]
private static void Decorate_OnCommand(CommandEventArgs e)
{
m_Mobile = e.Mobile;
@ -104,9 +103,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -124,9 +123,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -172,9 +171,9 @@ namespace Server.Commands
{
locked = true;
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -201,54 +200,54 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HintString"))
else if (m_Params[i].StartsWith("HintString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("HintNumber"))
else if (m_Params[i].StartsWith("HintNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -274,36 +273,36 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -325,9 +324,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("CannonDirection"))
if (m_Params[i].StartsWith("CannonDirection", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -349,27 +348,27 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Word"))
if (m_Params[i].StartsWith("Word", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
word = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("DestStart"))
else if (m_Params[i].StartsWith("DestStart", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
destination.Start = Point2D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEnd"))
else if (m_Params[i].StartsWith("DestEnd", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -387,9 +386,9 @@ namespace Server.Commands
for (var i = 0; !fill && i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Content"))
if (m_Params[i].StartsWith("Content", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -418,9 +417,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Facing"))
if (m_Params[i].StartsWith("Facing", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -448,9 +447,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("SpawnLocation"))
if (m_Params[i].StartsWith("SpawnLocation", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -516,45 +515,45 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Spawn"))
if (m_Params[i].StartsWith("Spawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.AddEntry(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MinDelay"))
else if (m_Params[i].StartsWith("MinDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MinDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MaxDelay"))
else if (m_Params[i].StartsWith("MaxDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MaxDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("NextSpawn"))
else if (m_Params[i].StartsWith("NextSpawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.NextSpawn = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Count"))
else if (m_Params[i].StartsWith("Count", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -565,36 +564,36 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Team"))
else if (m_Params[i].StartsWith("Team", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Team = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HomeRange"))
else if (m_Params[i].StartsWith("HomeRange", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.HomeRange = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Running"))
else if (m_Params[i].StartsWith("Running", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Running = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Group"))
else if (m_Params[i].StartsWith("Group", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -607,36 +606,36 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Description"))
if (m_Params[i].StartsWith("Description", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Description = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Marked"))
else if (m_Params[i].StartsWith("Marked", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Marked = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.TargetMap = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Target"))
else if (m_Params[i].StartsWith("Target", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -649,108 +648,108 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Skill"))
if (m_Params[i].StartsWith("Skill", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Skill = (SkillName)Enum.Parse(typeof(SkillName), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("RequiredFixedPoint"))
else if (m_Params[i].StartsWith("RequiredFixedPoint", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToInt32(m_Params[i].Substring(++indexOf)) * 0.1;
}
}
else if (m_Params[i].StartsWith("Required"))
else if (m_Params[i].StartsWith("Required", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToDouble(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MessageString"))
else if (m_Params[i].StartsWith("MessageString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("MessageNumber"))
else if (m_Params[i].StartsWith("MessageNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -768,90 +767,90 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Substring"))
if (m_Params[i].StartsWith("Substring", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Substring = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Keyword"))
else if (m_Params[i].StartsWith("Keyword", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Keyword = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Range"))
else if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -869,63 +868,63 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("PointDest"))
if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -943,9 +942,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("ContentType"))
if (m_Params[i].StartsWith("ContentType", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -972,18 +971,18 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Light"))
if (m_Params[i].StartsWith("Light", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Light = (LightType)Enum.Parse(typeof(LightType), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("Hue"))
else if (m_Params[i].StartsWith("Hue", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -999,18 +998,18 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Name"))
else if (m_Params[i].StartsWith("Name", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Name = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Amount"))
else if (m_Params[i].StartsWith("Amount", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -1249,7 +1248,7 @@ namespace Server.Commands
{
line = line.Trim();
if (line.Length > 0 && !line.StartsWith("#"))
if (line.Length > 0 && !line.StartsWith("#", StringComparison.Ordinal))
{
break;
}
@ -1262,7 +1261,7 @@ namespace Server.Commands
var list = new DecorationList();
var indexOf = line.IndexOf(' ');
var indexOf = line.IndexOf(' ', StringComparison.Ordinal);
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
@ -1272,14 +1271,14 @@ namespace Server.Commands
}
line = line.Substring(indexOf);
indexOf = line.IndexOf('(');
indexOf = line.IndexOf('(', StringComparison.Ordinal);
if (indexOf >= 0)
{
list.m_ItemID = Utility.ToInt32(line.Substring(0, indexOf - 1));
var parms = line.Substring(++indexOf);
if (line.EndsWith(")"))
if (line.EndsWith(")", StringComparison.Ordinal))
{
parms = parms.Substring(0, parms.Length - 1);
}
@ -1308,7 +1307,7 @@ namespace Server.Commands
break;
}
if (line.StartsWith("#"))
if (line.StartsWith("#", StringComparison.Ordinal))
{
continue;
}
@ -1338,7 +1337,7 @@ namespace Server.Commands
public static void Pop(out string v, ref string line)
{
var space = line.IndexOf(' ');
var space = line.IndexOf(' ', StringComparison.Ordinal);
if (space >= 0)
{

View file

@ -21,8 +21,7 @@ namespace Server.Commands
CommandSystem.Register("DecorateMag", AccessLevel.Administrator, DecorateMag_OnCommand);
}
[Usage("DecorateMag")]
[Description("Generates world decoration.")]
[Usage("DecorateMag"), Description("Generates world decoration.")]
private static void DecorateMag_OnCommand(CommandEventArgs e)
{
m_Mobile = e.Mobile;
@ -101,9 +100,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -121,9 +120,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("LabelNumber"))
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -169,9 +168,9 @@ namespace Server.Commands
{
locked = true;
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -198,54 +197,54 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HintString"))
else if (m_Params[i].StartsWith("HintString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("HintNumber"))
else if (m_Params[i].StartsWith("HintNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
hintNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -271,36 +270,36 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Range"))
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("WarningString"))
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("WarningNumber"))
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("ResetDelay"))
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -322,9 +321,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("CannonDirection"))
if (m_Params[i].StartsWith("CannonDirection", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -346,27 +345,27 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Word"))
if (m_Params[i].StartsWith("Word", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
word = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("DestStart"))
else if (m_Params[i].StartsWith("DestStart", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
destination.Start = Point2D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEnd"))
else if (m_Params[i].StartsWith("DestEnd", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -384,9 +383,9 @@ namespace Server.Commands
for (var i = 0; !fill && i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Content"))
if (m_Params[i].StartsWith("Content", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -415,9 +414,9 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Facing"))
if (m_Params[i].StartsWith("Facing", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -445,9 +444,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("SpawnLocation"))
if (m_Params[i].StartsWith("SpawnLocation", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -513,45 +512,45 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Spawn"))
if (m_Params[i].StartsWith("Spawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.AddEntry(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MinDelay"))
else if (m_Params[i].StartsWith("MinDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MinDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MaxDelay"))
else if (m_Params[i].StartsWith("MaxDelay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.MaxDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("NextSpawn"))
else if (m_Params[i].StartsWith("NextSpawn", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.NextSpawn = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Count"))
else if (m_Params[i].StartsWith("Count", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -562,36 +561,36 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Team"))
else if (m_Params[i].StartsWith("Team", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Team = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("HomeRange"))
else if (m_Params[i].StartsWith("HomeRange", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.HomeRange = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Running"))
else if (m_Params[i].StartsWith("Running", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
sp.Running = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Group"))
else if (m_Params[i].StartsWith("Group", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -604,36 +603,36 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Description"))
if (m_Params[i].StartsWith("Description", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Description = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Marked"))
else if (m_Params[i].StartsWith("Marked", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.Marked = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("TargetMap"))
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
rune.TargetMap = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Target"))
else if (m_Params[i].StartsWith("Target", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -646,108 +645,108 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Skill"))
if (m_Params[i].StartsWith("Skill", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Skill = (SkillName)Enum.Parse(typeof(SkillName), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("RequiredFixedPoint"))
else if (m_Params[i].StartsWith("RequiredFixedPoint", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToInt32(m_Params[i].Substring(++indexOf)) * 0.1;
}
}
else if (m_Params[i].StartsWith("Required"))
else if (m_Params[i].StartsWith("Required", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Required = Utility.ToDouble(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MessageString"))
else if (m_Params[i].StartsWith("MessageString", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageString = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("MessageNumber"))
else if (m_Params[i].StartsWith("MessageNumber", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MessageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
st.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -765,90 +764,90 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Substring"))
if (m_Params[i].StartsWith("Substring", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Substring = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Keyword"))
else if (m_Params[i].StartsWith("Keyword", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Keyword = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Range"))
else if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("PointDest"))
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
kt.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -866,63 +865,63 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("PointDest"))
if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("MapDest"))
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Creatures"))
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SourceEffect"))
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("DestEffect"))
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("SoundID"))
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
tp.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
}
}
else if (m_Params[i].StartsWith("Delay"))
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -940,9 +939,9 @@ namespace Server.Commands
{
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("ContentType"))
if (m_Params[i].StartsWith("ContentType", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -969,18 +968,18 @@ namespace Server.Commands
for (var i = 0; i < m_Params.Length; ++i)
{
if (m_Params[i].StartsWith("Light"))
if (m_Params[i].StartsWith("Light", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Light = (LightType)Enum.Parse(typeof(LightType), m_Params[i].Substring(++indexOf), true);
}
}
else if (m_Params[i].StartsWith("Hue"))
else if (m_Params[i].StartsWith("Hue", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -996,18 +995,18 @@ namespace Server.Commands
}
}
}
else if (m_Params[i].StartsWith("Name"))
else if (m_Params[i].StartsWith("Name", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
item.Name = m_Params[i].Substring(++indexOf);
}
}
else if (m_Params[i].StartsWith("Amount"))
else if (m_Params[i].StartsWith("Amount", StringComparison.Ordinal))
{
var indexOf = m_Params[i].IndexOf('=');
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
if (indexOf >= 0)
{
@ -1236,7 +1235,7 @@ namespace Server.Commands
{
line = line.Trim();
if (line.Length > 0 && !line.StartsWith("#"))
if (line.Length > 0 && !line.StartsWith("#", StringComparison.Ordinal))
{
break;
}
@ -1249,7 +1248,7 @@ namespace Server.Commands
var list = new DecorationListMag();
var indexOf = line.IndexOf(' ');
var indexOf = line.IndexOf(' ', StringComparison.Ordinal);
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
@ -1259,14 +1258,14 @@ namespace Server.Commands
}
line = line.Substring(indexOf);
indexOf = line.IndexOf('(');
indexOf = line.IndexOf('(', StringComparison.Ordinal);
if (indexOf >= 0)
{
list.m_ItemID = Utility.ToInt32(line.Substring(0, indexOf - 1));
var parms = line.Substring(++indexOf);
if (line.EndsWith(")"))
if (line.EndsWith(")", StringComparison.Ordinal))
{
parms = parms.Substring(0, parms.Length - 1);
}
@ -1295,7 +1294,7 @@ namespace Server.Commands
break;
}
if (line.StartsWith("#"))
if (line.StartsWith("#", StringComparison.Ordinal))
{
continue;
}
@ -1325,7 +1324,7 @@ namespace Server.Commands
public void Pop(out string v, ref string line)
{
var space = line.IndexOf(' ');
var space = line.IndexOf(' ', StringComparison.Ordinal);
if (space >= 0)
{

View file

@ -19,13 +19,6 @@ namespace Server.Commands
public bool Back { get; set; }
public override string ToString() => $"{{{Source},{Destination},{Back}}}";
public bool Equals(TeleporterDefinition other) =>
Source.Equals(other.Source) && Destination.Equals(other.Destination) && Back == other.Back;
public override bool Equals(object obj) => obj is TeleporterDefinition other && Equals(other);
public override int GetHashCode() => HashCode.Combine(Source, Destination, Back);
}
public static class GenTeleporter
@ -39,8 +32,7 @@ namespace Server.Commands
CommandSystem.Register("TelGenDelete", AccessLevel.Administrator, TelGenDelete_OnCommand);
}
[Usage("TelGenDelete")]
[Description("Destroys world/dungeon teleporters for all facets.")]
[Usage("TelGenDelete"), Description("Destroys world/dungeon teleporters for all facets.")]
public static void TelGenDelete_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -70,8 +62,7 @@ namespace Server.Commands
from.SendMessage(WarningHue, $"{count} Teleporters Removed.");
}
[Usage("TelGen")]
[Description("Generates world/dungeon teleporters for all facets.")]
[Usage("TelGen"), Description("Generates world/dungeon teleporters for all facets.")]
public static void GenTeleporter_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;

View file

@ -19,8 +19,7 @@ namespace Server.Commands
CommandSystem.Register("SetProfiles", AccessLevel.Administrator, SetProfiles_OnCommand);
}
[Usage("WriteProfiles")]
[Description("Generates a log files containing performance diagnostic information.")]
[Usage("WriteProfiles"), Description("Generates a log files containing performance diagnostic information.")]
public static void WriteProfiles_OnCommand(CommandEventArgs e)
{
try
@ -55,8 +54,8 @@ namespace Server.Commands
}
}
[Usage("SetProfiles [true | false]")]
[Description("Enables, disables, or toggles the state of core packet and timer profiling.")]
[Usage("SetProfiles [true | false]"),
Description("Enables, disables, or toggles the state of core packet and timer profiling.")]
public static void SetProfiles_OnCommand(CommandEventArgs e)
{
if (e.Length == 1)
@ -71,8 +70,8 @@ namespace Server.Commands
e.Mobile.SendMessage("Profiling has been {0}.", Core.Profiling ? "enabled" : "disabled");
}
[Usage("DumpTimers")]
[Description("Generates a log file of all currently executing timers. Used for tracing timer leaks.")]
[Usage("DumpTimers"),
Description("Generates a log file of all currently executing timers. Used for tracing timer leaks.")]
public static void DumpTimers_OnCommand(CommandEventArgs e)
{
try
@ -86,8 +85,7 @@ namespace Server.Commands
}
}
[Usage("CountObjects")]
[Description("Generates a log file detailing all item and mobile types in the world.")]
[Usage("CountObjects"), Description("Generates a log file detailing all item and mobile types in the world.")]
public static void CountObjects_OnCommand(CommandEventArgs e)
{
using (var op = new StreamWriter("objects.log"))
@ -141,8 +139,7 @@ namespace Server.Commands
e.Mobile.SendMessage("Object table has been generated. See the file : <runuo root>/objects.log");
}
[Usage("TraceExpanded")]
[Description("Generates a log file describing all items using expanded memory.")]
[Usage("TraceExpanded"), Description("Generates a log file describing all items using expanded memory.")]
public static void TraceExpanded_OnCommand(CommandEventArgs e)
{
var typeTable = new Dictionary<Type, int[]>();
@ -253,8 +250,7 @@ namespace Server.Commands
}
}
[Usage("TraceInternal")]
[Description("Generates a log file describing all items in the 'internal' map.")]
[Usage("TraceInternal"), Description("Generates a log file describing all items in the 'internal' map.")]
public static void TraceInternal_OnCommand(CommandEventArgs e)
{
var totalCount = 0;
@ -297,8 +293,8 @@ namespace Server.Commands
}
}
[Usage("ProfileWorld")]
[Description("Prints the amount of data serialized for every object type in your world file.")]
[Usage("ProfileWorld"),
Description("Prints the amount of data serialized for every object type in your world file.")]
public static void ProfileWorld_OnCommand(CommandEventArgs e)
{
ProfileWorld("items", "worldprofile_items.log");

View file

@ -49,8 +49,8 @@ namespace Server.Commands
CommandSystem.Register("Props", AccessLevel.Counselor, Props_OnCommand);
}
[Usage("Props [serial]")]
[Description("Opens a menu where you can view and edit all properties of a targeted (or specified) object.")]
[Usage("Props [serial]"),
Description("Opens a menu where you can view and edit all properties of a targeted (or specified) object.")]
private static void Props_OnCommand(CommandEventArgs e)
{
if (e.Length == 1)
@ -254,7 +254,7 @@ namespace Server.Commands
{
var valueString = args[1 + i * 2];
if (valueString.StartsWith("0x"))
if (valueString.StartsWith("0x", StringComparison.Ordinal))
{
realValues[i] = Convert.ToInt32(valueString.Substring(2), 16);
}
@ -483,7 +483,7 @@ namespace Server.Commands
{
toSet = null;
}
else if (value.StartsWith("0x") && IsNumeric(type))
else if (value.StartsWith("0x", StringComparison.Ordinal) && IsNumeric(type))
{
try
{
@ -620,7 +620,7 @@ namespace Server.Commands
namespace Server
{
public abstract class PropertyException : ApplicationException
public abstract class PropertyException : Exception
{
protected Property m_Property;
@ -739,13 +739,15 @@ namespace Server
public PropertyAccess Access { get; private set; }
private void NotYetBound() => throw new NotYetBoundException(this);
public PropertyInfo[] Chain
{
get
{
if (!IsBound)
{
throw new NotYetBoundException(this);
NotYetBound();
}
return m_Chain;
@ -758,7 +760,7 @@ namespace Server
{
if (!IsBound)
{
throw new NotYetBoundException(this);
NotYetBound();
}
return m_Chain[^1].PropertyType;

View file

@ -1,19 +1,19 @@
using System;
using System.Globalization;
namespace Server.Commands
{
public class ShardTime
public static class ShardTime
{
public static void Initialize()
{
CommandSystem.Register("Time", AccessLevel.Player, Time_OnCommand);
}
[Usage("Time")]
[Description("Returns the server's local time.")]
[Usage("Time"), Description("Returns the server's local time.")]
private static void Time_OnCommand(CommandEventArgs e)
{
e.Mobile.SendMessage(DateTime.UtcNow.ToString());
e.Mobile.SendMessage(DateTime.UtcNow.ToString(CultureInfo.InvariantCulture));
}
}
}

View file

@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using Server.Items;
namespace Server.Commands
{
public class SignParser
public static class SignParser
{
private static readonly Queue<Item> m_ToDelete = new Queue<Item>();
@ -13,8 +14,7 @@ namespace Server.Commands
CommandSystem.Register("SignGen", AccessLevel.Administrator, SignGen_OnCommand);
}
[Usage("SignGen")]
[Description("Generates world/shop signs on all facets.")]
[Usage("SignGen"), Description("Generates world/shop signs on all facets.")]
public static void SignGen_OnCommand(CommandEventArgs c)
{
Parse(c.Mobile);
@ -108,14 +108,13 @@ namespace Server.Commands
Item sign;
if (name.StartsWith("#"))
if (name.StartsWith("#", StringComparison.Ordinal))
{
sign = new LocalizedSign(itemID, Utility.ToInt32(name.Substring(1)));
}
else
{
sign = new Sign(itemID);
sign.Name = name;
sign = new Sign(itemID) { Name = name };
}
if (map == Map.Malas)

View file

@ -3,7 +3,7 @@ using Server.Targeting;
namespace Server.Commands
{
public class SkillsCommand
public static class SkillsCommand
{
public static void Initialize()
{
@ -12,8 +12,7 @@ namespace Server.Commands
CommandSystem.Register("SetAllSkills", AccessLevel.GameMaster, SetAllSkills_OnCommand);
}
[Usage("SetSkill <name> <value>")]
[Description("Sets a skill value by name of a targeted mobile.")]
[Usage("SetSkill <name> <value>"), Description("Sets a skill value by name of a targeted mobile.")]
public static void SetSkill_OnCommand(CommandEventArgs arg)
{
if (arg.Length != 2)
@ -33,8 +32,7 @@ namespace Server.Commands
}
}
[Usage("SetAllSkills <name> <value>")]
[Description("Sets all skill values of a targeted mobile.")]
[Usage("SetAllSkills <name> <value>"), Description("Sets all skill values of a targeted mobile.")]
public static void SetAllSkills_OnCommand(CommandEventArgs arg)
{
if (arg.Length != 1)
@ -47,8 +45,7 @@ namespace Server.Commands
}
}
[Usage("GetSkill <name>")]
[Description("Gets a skill value by name of a targeted mobile.")]
[Usage("GetSkill <name>"), Description("Gets a skill value by name of a targeted mobile.")]
public static void GetSkill_OnCommand(CommandEventArgs arg)
{
if (arg.Length != 1)

View file

@ -3,7 +3,7 @@ using Server.Targeting;
namespace Server.Commands
{
public class Skills
public static class SkillsMenu
{
public static void Initialize()
{
@ -15,8 +15,7 @@ namespace Server.Commands
CommandSystem.Register("Skills", AccessLevel.Counselor, Skills_OnCommand);
}
[Usage("Skills")]
[Description("Opens a menu where you can view or edit skills of a targeted mobile.")]
[Usage("Skills"), Description("Opens a menu where you can view or edit skills of a targeted mobile.")]
private static void Skills_OnCommand(CommandEventArgs e)
{
e.Mobile.Target = new SkillsTarget();

View file

@ -6,7 +6,7 @@ using Server.Items;
namespace Server
{
public class Statics
public static class Statics
{
public delegate void FreezeCallback(Mobile from, bool okay, StateInfo si);
@ -47,16 +47,14 @@ namespace Server
CommandSystem.Register("UnfreezeWorld", AccessLevel.Administrator, UnfreezeWorld_OnCommand);
}
[Usage("Freeze")]
[Description("Makes a targeted area of dynamic items static.")]
[Usage("Freeze"), Description("Makes a targeted area of dynamic items static.")]
public static void Freeze_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
BoundingBoxPicker.Begin(from, (map, start, end) => FreezeBox_Callback(from, map, start, end));
}
[Usage("FreezeMap")]
[Description("Makes every dynamic item in your map static.")]
[Usage("FreezeMap"), Description("Makes every dynamic item in your map static.")]
public static void FreezeMap_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
@ -76,8 +74,7 @@ namespace Server
}
}
[Usage("FreezeWorld")]
[Description("Makes every dynamic item on all maps static.")]
[Usage("FreezeWorld"), Description("Makes every dynamic item on all maps static.")]
public static void FreezeWorld_OnCommand(CommandEventArgs e)
{
SendWarning(
@ -406,16 +403,14 @@ namespace Server
}
}
[Usage("Unfreeze")]
[Description("Makes a targeted area of static items dynamic.")]
[Usage("Unfreeze"), Description("Makes a targeted area of static items dynamic.")]
public static void Unfreeze_OnCommand(CommandEventArgs e)
{
var from = e.Mobile;
BoundingBoxPicker.Begin(from, (map, start, end) => UnfreezeBox_Callback(from, map, start, end));
}
[Usage("UnfreezeMap")]
[Description("Makes every static item in your map dynamic.")]
[Usage("UnfreezeMap"), Description("Makes every static item in your map dynamic.")]
public static void UnfreezeMap_OnCommand(CommandEventArgs e)
{
var map = e.Mobile.Map;
@ -434,8 +429,7 @@ namespace Server
}
}
[Usage("UnfreezeWorld")]
[Description("Makes every static item on all maps dynamic.")]
[Usage("UnfreezeWorld"), Description("Makes every static item on all maps dynamic.")]
public static void UnfreezeWorld_OnCommand(CommandEventArgs e)
{
SendWarning(

View file

@ -21,10 +21,9 @@ namespace Server.Commands
(m as PlayerMobile)?.VisibilityList.Clear();
}
[Usage("Vis")]
[Description(
"Adds or removes a targeted player from your visibility list. Anyone on your visibility list will be able to see you at all times, even when you're hidden."
)]
[Usage("Vis"), Description(
"Adds or removes a targeted player from your visibility list. Anyone on your visibility list will be able to see you at all times, even when you're hidden."
)]
public static void Vis_OnCommand(CommandEventArgs e)
{
if (e.Mobile is PlayerMobile)
@ -34,8 +33,7 @@ namespace Server.Commands
}
}
[Usage("VisList")]
[Description("Shows the names of everyone in your visibility list.")]
[Usage("VisList"), Description("Shows the names of everyone in your visibility list.")]
public static void VisList_OnCommand(CommandEventArgs e)
{
if (e.Mobile is PlayerMobile pm)
@ -58,8 +56,7 @@ namespace Server.Commands
}
}
[Usage("VisClear")]
[Description("Removes everyone from your visibility list.")]
[Usage("VisClear"), Description("Removes everyone from your visibility list.")]
public static void VisClear_OnCommand(CommandEventArgs e)
{
if (e.Mobile is PlayerMobile pm)

View file

@ -5,7 +5,7 @@ using Server.Multis;
namespace Server.Commands
{
public class Wipe
public static class Wipe
{
[Flags]
public enum WipeType
@ -24,29 +24,25 @@ namespace Server.Commands
CommandSystem.Register("WipeMultis", AccessLevel.GameMaster, WipeMultis_OnCommand);
}
[Usage("Wipe")]
[Description("Wipes all items and npcs in a targeted bounding box.")]
[Usage("Wipe"), Description("Wipes all items and npcs in a targeted bounding box.")]
private static void WipeAll_OnCommand(CommandEventArgs e)
{
BeginWipe(e.Mobile, WipeType.Items | WipeType.Mobiles);
}
[Usage("WipeItems")]
[Description("Wipes all items in a targeted bounding box.")]
[Usage("WipeItems"), Description("Wipes all items in a targeted bounding box.")]
private static void WipeItems_OnCommand(CommandEventArgs e)
{
BeginWipe(e.Mobile, WipeType.Items);
}
[Usage("WipeNPCs")]
[Description("Wipes all npcs in a targeted bounding box.")]
[Usage("WipeNPCs"), Description("Wipes all npcs in a targeted bounding box.")]
private static void WipeNPCs_OnCommand(CommandEventArgs e)
{
BeginWipe(e.Mobile, WipeType.Mobiles);
}
[Usage("WipeMultis")]
[Description("Wipes all multis in a targeted bounding box.")]
[Usage("WipeMultis"), Description("Wipes all multis in a targeted bounding box.")]
private static void WipeMultis_OnCommand(CommandEventArgs e)
{
BeginWipe(e.Mobile, WipeType.Multis);