fix(core): Optimizes strings / .NET 5 compatibility changes (#354)
- [X] Removes some string allocations (e.g. split) - [X] Optimizes some collections - [X] Converts insensitive to extension methods of built-ins. - [X] Adds ordinal (case sensitive) string helpers - [X] Fixes conditionals for in-game commands so they use Ordinal comparisons. - [X] Replaces ToLower.Contains with InsensitiveContains - [X] Adds ValueStringBuilder - [X] Implements ValueStringBuilder in a few places where it makes sense - [X] Removes the redundant Wrap function and replaces it with an optimized version - [X] Fixes list conversions in Utility Closes #351 Bumps release version
This commit is contained in:
parent
92aae8d482
commit
77ce2e1980
117 changed files with 2000 additions and 1226 deletions
|
|
@ -208,7 +208,7 @@ namespace Server.Commands
|
|||
|
||||
public void GetDetails(out string command, out string argString, out string[] args)
|
||||
{
|
||||
var indexOf = Command.IndexOf(' ', StringComparison.Ordinal);
|
||||
var indexOf = Command.IndexOfOrdinal(' ');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ namespace Server.Commands
|
|||
|
||||
if (type.IsGenericType)
|
||||
{
|
||||
var index = type.Name.IndexOf('`', StringComparison.Ordinal);
|
||||
var index = type.Name.IndexOfOrdinal('`');
|
||||
|
||||
if (index > 0)
|
||||
{
|
||||
|
|
@ -406,19 +406,14 @@ namespace Server.Commands
|
|||
|
||||
public static string SanitizeType(string name)
|
||||
{
|
||||
var anonymousType = name.Contains('<', StringComparison.Ordinal);
|
||||
var anonymousType = name.ContainsOrdinal('<');
|
||||
var sb = new StringBuilder(name);
|
||||
for (var i = 0; i < ReplaceChars.Length; ++i)
|
||||
{
|
||||
sb.Replace(ReplaceChars[i], '-');
|
||||
}
|
||||
|
||||
if (anonymousType)
|
||||
{
|
||||
return $"(Anonymous-Type){sb}";
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
return anonymousType ? $"(Anonymous-Type){sb}" : sb.ToString();
|
||||
}
|
||||
|
||||
public static string AliasForName(string name)
|
||||
|
|
@ -465,7 +460,7 @@ namespace Server.Commands
|
|||
return true;
|
||||
}
|
||||
|
||||
if (type.Namespace.StartsWith("Server", StringComparison.Ordinal))
|
||||
if (type.Namespace.StartsWithOrdinal("Server"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -604,7 +599,7 @@ namespace Server.Commands
|
|||
if (realType?.IsGenericType == true)
|
||||
{
|
||||
FormatGeneric(realType, out _, out _, out var linkName);
|
||||
aliased = linkName.Replace("@directory@", null, StringComparison.Ordinal);
|
||||
aliased = linkName.ReplaceOrdinal("@directory@", null);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1719,7 +1714,7 @@ namespace Server.Commands
|
|||
{
|
||||
line = line.Trim();
|
||||
|
||||
if (line.Length == 0 || line.StartsWith("#", StringComparison.Ordinal))
|
||||
if (line.Length == 0 || line.StartsWithOrdinal("#"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -2030,8 +2025,8 @@ namespace Server.Commands
|
|||
var aliases = attrs.Length == 0 ? null : attrs[0] as AliasesAttribute;
|
||||
|
||||
var descString = desc.Description
|
||||
.Replace("<", "<", StringComparison.Ordinal)
|
||||
.Replace(">", ">", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", "<")
|
||||
.ReplaceOrdinal(">", ">");
|
||||
|
||||
list.Add(new DocCommandEntry(e.AccessLevel, e.Command, aliases?.Aliases, usage.Usage, descString));
|
||||
}
|
||||
|
|
@ -2058,8 +2053,8 @@ namespace Server.Commands
|
|||
}
|
||||
|
||||
desc = desc
|
||||
.Replace("<", "<", StringComparison.Ordinal)
|
||||
.Replace(">", ">", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", "<")
|
||||
.ReplaceOrdinal(">", ">");
|
||||
|
||||
if (command.Supports != CommandSupport.Single)
|
||||
{
|
||||
|
|
@ -2136,8 +2131,8 @@ namespace Server.Commands
|
|||
}
|
||||
|
||||
desc = desc
|
||||
.Replace("<", "<", StringComparison.Ordinal)
|
||||
.Replace(">", ">", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", "<")
|
||||
.ReplaceOrdinal(">", ">");
|
||||
|
||||
list.Add(new DocCommandEntry(command.AccessLevel, cmd, aliases, usage, desc));
|
||||
}
|
||||
|
|
@ -2237,8 +2232,8 @@ namespace Server.Commands
|
|||
html.Write(
|
||||
"<td class=\"rentry\"><b>Usage: {0}</b><br>{1}</td>",
|
||||
usage
|
||||
.Replace("<", "<", StringComparison.Ordinal)
|
||||
.Replace(">", ">", StringComparison.Ordinal),
|
||||
.ReplaceOrdinal("<", "<")
|
||||
.ReplaceOrdinal(">", ">"),
|
||||
desc
|
||||
);
|
||||
}
|
||||
|
|
@ -2247,8 +2242,8 @@ namespace Server.Commands
|
|||
html.Write(
|
||||
"<td class=\"rentry\"><b>Usage: {0}</b><br>Alias{1}: ",
|
||||
usage
|
||||
.Replace("<", "<", StringComparison.Ordinal)
|
||||
.Replace(">", ">", StringComparison.Ordinal),
|
||||
.ReplaceOrdinal("<", "<")
|
||||
.ReplaceOrdinal(">", ">"),
|
||||
aliases.Length == 1 ? "" : "es"
|
||||
);
|
||||
|
||||
|
|
@ -2567,7 +2562,7 @@ namespace Server.Commands
|
|||
if (ifaceInfo == null)
|
||||
{
|
||||
FormatGeneric(iface, out _, out _, out var linkName);
|
||||
typeHtml.Write($"<!-- DBG-2.1 -->{linkName.Replace("@directory@", null, StringComparison.Ordinal)}");
|
||||
typeHtml.Write($"<!-- DBG-2.1 -->{linkName.ReplaceOrdinal("@directory@", null)}");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -2913,7 +2908,7 @@ namespace Server.Commands
|
|||
public string FileName => m_FileName;
|
||||
public string TypeName => m_TypeName;
|
||||
|
||||
public string LinkName(string dirRoot) => m_LinkName.Replace("@directory@", dirRoot, StringComparison.Ordinal);
|
||||
public string LinkName(string dirRoot) => m_LinkName.ReplaceOrdinal("@directory@", dirRoot);
|
||||
}
|
||||
|
||||
private class SpeechEntry
|
||||
|
|
|
|||
|
|
@ -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", StringComparison.Ordinal))
|
||||
result.StartsWithOrdinal("Getting this property"))
|
||||
{
|
||||
LogFailure(result);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ namespace Server.Commands.Generic
|
|||
{
|
||||
var offset = 0;
|
||||
|
||||
if (Insensitive.Equals(e.GetString(0), "view"))
|
||||
if (e.GetString(0).InsensitiveEquals("view"))
|
||||
{
|
||||
++offset;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ namespace Server.Commands.Generic
|
|||
{
|
||||
var style = NumberStyles.Integer;
|
||||
|
||||
if (Insensitive.StartsWith(toParse, "0x"))
|
||||
if (toParse.InsensitiveStartsWith("0x"))
|
||||
{
|
||||
style = NumberStyles.HexNumber;
|
||||
toParse = toParse.Substring(2);
|
||||
|
|
@ -231,7 +231,6 @@ namespace Server.Commands.Generic
|
|||
NotEqual,
|
||||
|
||||
Contains,
|
||||
|
||||
StartsWith,
|
||||
EndsWith
|
||||
}
|
||||
|
|
@ -260,39 +259,74 @@ namespace Server.Commands.Generic
|
|||
{
|
||||
var inverse = false;
|
||||
|
||||
Type type = m_IgnoreCase ? typeof(InsensitiveStringHelpers) : typeof(OrdinalStringHelpers);
|
||||
string methodName;
|
||||
|
||||
switch (m_Operator)
|
||||
{
|
||||
case StringOperator.Equal:
|
||||
methodName = "Equals";
|
||||
break;
|
||||
|
||||
case StringOperator.NotEqual:
|
||||
methodName = "Equals";
|
||||
inverse = true;
|
||||
break;
|
||||
{
|
||||
inverse = true;
|
||||
goto case StringOperator.Equal;
|
||||
}
|
||||
case StringOperator.Equal:
|
||||
{
|
||||
if (m_IgnoreCase)
|
||||
{
|
||||
methodName = "InsensitiveEquals";
|
||||
}
|
||||
else
|
||||
{
|
||||
methodName = "EqualsOrdinal";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case StringOperator.Contains:
|
||||
methodName = "Contains";
|
||||
break;
|
||||
{
|
||||
if (m_IgnoreCase)
|
||||
{
|
||||
methodName = "InsensitiveContains";
|
||||
}
|
||||
else
|
||||
{
|
||||
methodName = "ContainsOrdinal";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case StringOperator.StartsWith:
|
||||
methodName = "StartsWith";
|
||||
break;
|
||||
{
|
||||
if (m_IgnoreCase)
|
||||
{
|
||||
methodName = "InsensitiveStartsWith";
|
||||
}
|
||||
else
|
||||
{
|
||||
methodName = "StartsWithOrdinal";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case StringOperator.EndsWith:
|
||||
methodName = "EndsWith";
|
||||
break;
|
||||
{
|
||||
if (m_IgnoreCase)
|
||||
{
|
||||
methodName = "InsensitiveEndsWith";
|
||||
}
|
||||
else
|
||||
{
|
||||
methodName = "EndsWithOrdinal";
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
throw new InvalidOperationException("Invalid string comparison operator.");
|
||||
}
|
||||
|
||||
if (m_IgnoreCase || methodName == "Equals")
|
||||
if (m_Operator == StringOperator.Equal || m_Operator == StringOperator.NotEqual)
|
||||
{
|
||||
var type = m_IgnoreCase ? typeof(Insensitive) : typeof(string);
|
||||
|
||||
emitter.BeginCall(
|
||||
type.GetMethod(
|
||||
methodName,
|
||||
|
|
@ -334,7 +368,7 @@ namespace Server.Commands.Generic
|
|||
emitter.LoadLocal(temp);
|
||||
|
||||
emitter.BeginCall(
|
||||
typeof(string).GetMethod(
|
||||
type.GetMethod(
|
||||
methodName,
|
||||
BindingFlags.Public | BindingFlags.Instance,
|
||||
null,
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ namespace Server.Commands.Generic
|
|||
throw new Exception("Invalid ordering syntax.");
|
||||
}
|
||||
|
||||
if (Insensitive.Equals(arguments[offset], "by"))
|
||||
if (arguments[offset].InsensitiveEquals("by"))
|
||||
{
|
||||
++offset;
|
||||
--size;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using Server.Buffers;
|
||||
|
||||
namespace Server.Commands.Generic
|
||||
{
|
||||
|
|
@ -185,7 +186,7 @@ namespace Server.Commands.Generic
|
|||
|
||||
// NOTE: this does not preserve the case where quotation marks are used on a single word
|
||||
|
||||
var sb = new StringBuilder();
|
||||
using var sb = new ValueStringBuilder(stackalloc char[64]);
|
||||
|
||||
for (var i = 0; i < args.Length; ++i)
|
||||
{
|
||||
|
|
@ -194,7 +195,7 @@ namespace Server.Commands.Generic
|
|||
sb.Append(' ');
|
||||
}
|
||||
|
||||
if (args[i].Contains(' ', StringComparison.Ordinal))
|
||||
if (args[i].ContainsOrdinal(' '))
|
||||
{
|
||||
sb.Append('"');
|
||||
sb.Append(args[i]);
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ namespace Server.Commands.Generic
|
|||
|
||||
for (var i = 0; i < args.Length; ++i)
|
||||
{
|
||||
if (Insensitive.Equals(args[i], "where"))
|
||||
if (args[i].InsensitiveEquals("where"))
|
||||
{
|
||||
var origArgs = args;
|
||||
|
||||
|
|
@ -111,9 +111,7 @@ namespace Server.Commands.Generic
|
|||
}
|
||||
|
||||
var conditions = new List<ICondition[]>();
|
||||
var current = new List<ICondition>();
|
||||
|
||||
current.Add(TypeCondition.Default);
|
||||
var current = new List<ICondition> { TypeCondition.Default };
|
||||
|
||||
var index = 1;
|
||||
|
||||
|
|
@ -123,7 +121,7 @@ namespace Server.Commands.Generic
|
|||
|
||||
var inverse = false;
|
||||
|
||||
if (Insensitive.Equals(cur, "not") || cur == "!")
|
||||
if (cur.InsensitiveEquals("not") || cur == "!")
|
||||
{
|
||||
inverse = true;
|
||||
++index;
|
||||
|
|
@ -133,7 +131,7 @@ namespace Server.Commands.Generic
|
|||
throw new Exception("Improperly formatted object conditional.");
|
||||
}
|
||||
}
|
||||
else if (Insensitive.Equals(cur, "or") || cur == "||")
|
||||
else if (cur.InsensitiveEquals("or") || cur == "||")
|
||||
{
|
||||
if (current.Count > 1)
|
||||
{
|
||||
|
|
@ -199,7 +197,7 @@ namespace Server.Commands.Generic
|
|||
"contains" => new StringCondition(prop, inverse, StringOperator.Contains, val, false),
|
||||
"contains~" => new StringCondition(prop, inverse, StringOperator.Contains, val, true),
|
||||
"~contains" => new StringCondition(prop, inverse, StringOperator.Contains, val, true),
|
||||
_ => null
|
||||
_ => null
|
||||
};
|
||||
|
||||
if (condition == null)
|
||||
|
|
|
|||
|
|
@ -582,7 +582,7 @@ namespace Server.Commands
|
|||
continue;
|
||||
}
|
||||
|
||||
if (Insensitive.Equals(name, map.Name))
|
||||
if (name.InsensitiveEquals(map.Name))
|
||||
{
|
||||
from.Map = map;
|
||||
return;
|
||||
|
|
@ -595,7 +595,7 @@ namespace Server.Commands
|
|||
{
|
||||
var r = kvp.Value;
|
||||
|
||||
if (Insensitive.Equals(r.Name, name))
|
||||
if (r.Name.InsensitiveEquals(name))
|
||||
{
|
||||
from.Location = new Point3D(r.GoLocation);
|
||||
return;
|
||||
|
|
@ -613,7 +613,7 @@ namespace Server.Commands
|
|||
|
||||
foreach (var r in map.Regions.Values)
|
||||
{
|
||||
if (Insensitive.Equals(r.Name, name))
|
||||
if (r.Name.InsensitiveEquals(name))
|
||||
{
|
||||
from.MoveToWorld(r.GoLocation, map);
|
||||
return;
|
||||
|
|
@ -676,8 +676,8 @@ namespace Server.Commands
|
|||
e.GetInt32(0),
|
||||
e.GetInt32(4),
|
||||
e.GetInt32(1),
|
||||
Insensitive.Equals(e.GetString(5), "E"),
|
||||
Insensitive.Equals(e.GetString(2), "S")
|
||||
e.GetString(5).InsensitiveEquals("E"),
|
||||
e.GetString(2).InsensitiveEquals("S")
|
||||
);
|
||||
|
||||
if (p != Point3D.Zero)
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ namespace Server.Commands
|
|||
var aliases = attrs.Length == 0 ? null : attrs[0] as AliasesAttribute;
|
||||
|
||||
var descString = desc.Description
|
||||
.Replace("<", "(", StringComparison.Ordinal)
|
||||
.Replace(">", ")", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", "(")
|
||||
.ReplaceOrdinal(">", ")");
|
||||
|
||||
if (aliases == null)
|
||||
{
|
||||
|
|
@ -140,8 +140,8 @@ namespace Server.Commands
|
|||
}
|
||||
|
||||
desc = desc
|
||||
.Replace("<", "(", StringComparison.Ordinal)
|
||||
.Replace(">", ")", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", "(")
|
||||
.ReplaceOrdinal(">", ")");
|
||||
|
||||
if (command.Supports != CommandSupport.Single)
|
||||
{
|
||||
|
|
@ -229,8 +229,8 @@ namespace Server.Commands
|
|||
}
|
||||
|
||||
desc = desc
|
||||
.Replace("<", ")", StringComparison.Ordinal)
|
||||
.Replace(">", ")", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", ")")
|
||||
.ReplaceOrdinal(">", ")");
|
||||
|
||||
list.Add(new CommandInfo(command.AccessLevel, cmd, aliases, usage, desc));
|
||||
|
||||
|
|
@ -413,8 +413,8 @@ namespace Server.Commands
|
|||
|
||||
sb.Append("Usage: ");
|
||||
var usage = info.Usage
|
||||
.Replace("<", "(", StringComparison.Ordinal)
|
||||
.Replace(">", ")", StringComparison.Ordinal);
|
||||
.ReplaceOrdinal("<", "(")
|
||||
.ReplaceOrdinal(">", ")");
|
||||
sb.Append(usage);
|
||||
sb.Append("<BR>");
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; isSafe && i < m_NotSafe.Length; ++i)
|
||||
{
|
||||
isSafe = !ip.Contains(m_NotSafe[i], StringComparison.Ordinal);
|
||||
isSafe = !ip.ContainsOrdinal(m_NotSafe[i]);
|
||||
}
|
||||
|
||||
if (isSafe)
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < args.Length; ++i)
|
||||
{
|
||||
if (Insensitive.Equals(args[i], "set"))
|
||||
if (args[i].InsensitiveEquals("set"))
|
||||
{
|
||||
var remains = args.Length - i - 1;
|
||||
|
||||
|
|
@ -179,7 +179,7 @@ namespace Server.Commands
|
|||
|
||||
for (var j = 0; thisProp == null && j < allProps.Length; ++j)
|
||||
{
|
||||
if (Insensitive.Equals(propName, allProps[j].Name))
|
||||
if (propName.InsensitiveEquals(allProps[j].Name))
|
||||
{
|
||||
thisProp = allProps[j];
|
||||
}
|
||||
|
|
@ -300,7 +300,7 @@ namespace Server.Commands
|
|||
|
||||
object obj = value;
|
||||
|
||||
if (value?.StartsWith("0x", StringComparison.Ordinal) == true)
|
||||
if (value.StartsWithOrdinal("0x"))
|
||||
{
|
||||
if (IsSignedNumeric(type))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ namespace Server.Gumps
|
|||
var t = types[i];
|
||||
|
||||
if ((typeofMobile.IsAssignableFrom(t) || typeofItem.IsAssignableFrom(t)) &&
|
||||
t.Name.ToLower().Contains(match, StringComparison.Ordinal) && !results.Contains(t))
|
||||
t.Name.InsensitiveContains(match) && !results.Contains(t))
|
||||
{
|
||||
var ctors = t.GetConstructors();
|
||||
|
||||
|
|
|
|||
|
|
@ -304,7 +304,7 @@ namespace Server.Commands
|
|||
|
||||
var text = lines[index].Text;
|
||||
|
||||
var start = text.IndexOf('(', StringComparison.Ordinal);
|
||||
var start = text.IndexOfOrdinal('(');
|
||||
|
||||
if (start < 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("LabelNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -123,9 +123,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("LabelNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -171,9 +171,9 @@ namespace Server.Commands
|
|||
{
|
||||
locked = true;
|
||||
}
|
||||
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("TargetMap"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -200,54 +200,54 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Range"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("HintString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("HintString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
hintString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("HintNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("HintNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
hintNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("ResetDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -273,36 +273,36 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Range"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("ResetDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -324,9 +324,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("CannonDirection", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("CannonDirection"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -348,27 +348,27 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Word", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Word"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
word = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestStart", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestStart"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
destination.Start = Point2D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEnd", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEnd"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -386,9 +386,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; !fill && i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Content", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Content"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -417,9 +417,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Facing", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Facing"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -447,9 +447,9 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("SpawnLocation", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("SpawnLocation"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -515,45 +515,45 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Spawn", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Spawn"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.AddEntry(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MinDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MinDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.MinDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MaxDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MaxDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.MaxDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("NextSpawn", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("NextSpawn"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.NextSpawn = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Count", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Count"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -564,36 +564,36 @@ namespace Server.Commands
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Team", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Team"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.Team = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("HomeRange", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("HomeRange"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.HomeRange = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Running", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Running"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.Running = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Group", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Group"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -606,36 +606,36 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Description", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Description"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
rune.Description = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Marked", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Marked"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
rune.Marked = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("TargetMap"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
rune.TargetMap = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Target", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Target"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -648,108 +648,108 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Skill", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Skill"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Skill = (SkillName)Enum.Parse(typeof(SkillName), m_Params[i].Substring(++indexOf), true);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("RequiredFixedPoint", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("RequiredFixedPoint"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Required = Utility.ToInt32(m_Params[i].Substring(++indexOf)) * 0.1;
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Required", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Required"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Required = Utility.ToDouble(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MessageString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MessageString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.MessageString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MessageNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MessageNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.MessageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("PointDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MapDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Creatures"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SourceEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SoundID"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Delay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -767,90 +767,90 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Substring", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Substring"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Substring = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Keyword", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Keyword"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Keyword = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Range"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("PointDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MapDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Creatures"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SourceEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SoundID"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Delay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -868,63 +868,63 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("PointDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MapDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Creatures"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SourceEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SoundID"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Delay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -942,9 +942,9 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("ContentType", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("ContentType"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -971,18 +971,18 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Light", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Light"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
item.Light = (LightType)Enum.Parse(typeof(LightType), m_Params[i].Substring(++indexOf), true);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Hue", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Hue"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -998,18 +998,18 @@ namespace Server.Commands
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Name", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Name"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
item.Name = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Amount", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Amount"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -1248,7 +1248,7 @@ namespace Server.Commands
|
|||
{
|
||||
line = line.Trim();
|
||||
|
||||
if (line.Length > 0 && !line.StartsWith("#", StringComparison.Ordinal))
|
||||
if (line.Length > 0 && !line.StartsWithOrdinal("#"))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
@ -1261,7 +1261,7 @@ namespace Server.Commands
|
|||
|
||||
var list = new DecorationList();
|
||||
|
||||
var indexOf = line.IndexOf(' ', StringComparison.Ordinal);
|
||||
var indexOf = line.IndexOfOrdinal(' ');
|
||||
|
||||
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
|
||||
|
||||
|
|
@ -1271,14 +1271,14 @@ namespace Server.Commands
|
|||
}
|
||||
|
||||
line = line.Substring(indexOf);
|
||||
indexOf = line.IndexOf('(', StringComparison.Ordinal);
|
||||
indexOf = line.IndexOfOrdinal('(');
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
list.m_ItemID = Utility.ToInt32(line.Substring(0, indexOf - 1));
|
||||
|
||||
var parms = line.Substring(++indexOf);
|
||||
|
||||
if (line.EndsWith(")", StringComparison.Ordinal))
|
||||
if (line.EndsWithOrdinal(")"))
|
||||
{
|
||||
parms = parms.Substring(0, parms.Length - 1);
|
||||
}
|
||||
|
|
@ -1307,7 +1307,7 @@ namespace Server.Commands
|
|||
break;
|
||||
}
|
||||
|
||||
if (line.StartsWith("#", StringComparison.Ordinal))
|
||||
if (line.StartsWithOrdinal("#"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1337,7 +1337,7 @@ namespace Server.Commands
|
|||
|
||||
public static void Pop(out string v, ref string line)
|
||||
{
|
||||
var space = line.IndexOf(' ', StringComparison.Ordinal);
|
||||
var space = line.IndexOfOrdinal(' ');
|
||||
|
||||
if (space >= 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -100,9 +100,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("LabelNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -120,9 +120,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("LabelNumber", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("LabelNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -168,9 +168,9 @@ namespace Server.Commands
|
|||
{
|
||||
locked = true;
|
||||
}
|
||||
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("TargetMap"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -197,54 +197,54 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Range"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("HintString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("HintString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
hintString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("HintNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("HintNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
hintNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("ResetDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -270,36 +270,36 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Range"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("WarningNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("WarningNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
messageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("ResetDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("ResetDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -321,9 +321,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("CannonDirection", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("CannonDirection"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -345,27 +345,27 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Word", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Word"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
word = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestStart", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestStart"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
destination.Start = Point2D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEnd", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEnd"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -383,9 +383,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; !fill && i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Content", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Content"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -414,9 +414,9 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Facing", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Facing"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -444,9 +444,9 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("SpawnLocation", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("SpawnLocation"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -512,45 +512,45 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Spawn", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Spawn"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.AddEntry(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MinDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MinDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.MinDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MaxDelay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MaxDelay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.MaxDelay = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("NextSpawn", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("NextSpawn"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.NextSpawn = TimeSpan.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Count", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Count"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -561,36 +561,36 @@ namespace Server.Commands
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Team", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Team"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.Team = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("HomeRange", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("HomeRange"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.HomeRange = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Running", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Running"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
sp.Running = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Group", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Group"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -603,36 +603,36 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Description", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Description"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
rune.Description = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Marked", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Marked"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
rune.Marked = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("TargetMap", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("TargetMap"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
rune.TargetMap = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Target", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Target"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -645,108 +645,108 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Skill", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Skill"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Skill = (SkillName)Enum.Parse(typeof(SkillName), m_Params[i].Substring(++indexOf), true);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("RequiredFixedPoint", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("RequiredFixedPoint"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Required = Utility.ToInt32(m_Params[i].Substring(++indexOf)) * 0.1;
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Required", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Required"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Required = Utility.ToDouble(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MessageString", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MessageString"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.MessageString = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MessageNumber", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MessageNumber"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.MessageNumber = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("PointDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MapDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Creatures"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SourceEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SoundID"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
st.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Delay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -764,90 +764,90 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Substring", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Substring"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Substring = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Keyword", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Keyword"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Keyword = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Range", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Range"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Range = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("PointDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MapDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Creatures"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SourceEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SoundID"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
kt.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Delay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -865,63 +865,63 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("PointDest", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("PointDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.PointDest = Point3D.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("MapDest", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("MapDest"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.MapDest = Map.Parse(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Creatures", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Creatures"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.Creatures = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SourceEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SourceEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.SourceEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("DestEffect", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("DestEffect"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.DestEffect = Utility.ToBoolean(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("SoundID", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("SoundID"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
tp.SoundID = Utility.ToInt32(m_Params[i].Substring(++indexOf));
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Delay", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Delay"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -939,9 +939,9 @@ namespace Server.Commands
|
|||
{
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("ContentType", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("ContentType"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -968,18 +968,18 @@ namespace Server.Commands
|
|||
|
||||
for (var i = 0; i < m_Params.Length; ++i)
|
||||
{
|
||||
if (m_Params[i].StartsWith("Light", StringComparison.Ordinal))
|
||||
if (m_Params[i].StartsWithOrdinal("Light"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
item.Light = (LightType)Enum.Parse(typeof(LightType), m_Params[i].Substring(++indexOf), true);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Hue", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Hue"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -995,18 +995,18 @@ namespace Server.Commands
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Name", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Name"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
item.Name = m_Params[i].Substring(++indexOf);
|
||||
}
|
||||
}
|
||||
else if (m_Params[i].StartsWith("Amount", StringComparison.Ordinal))
|
||||
else if (m_Params[i].StartsWithOrdinal("Amount"))
|
||||
{
|
||||
var indexOf = m_Params[i].IndexOf('=', StringComparison.Ordinal);
|
||||
var indexOf = m_Params[i].IndexOfOrdinal('=');
|
||||
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
|
|
@ -1235,7 +1235,7 @@ namespace Server.Commands
|
|||
{
|
||||
line = line.Trim();
|
||||
|
||||
if (line.Length > 0 && !line.StartsWith("#", StringComparison.Ordinal))
|
||||
if (line.Length > 0 && !line.StartsWithOrdinal("#"))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
@ -1248,7 +1248,7 @@ namespace Server.Commands
|
|||
|
||||
var list = new DecorationListMag();
|
||||
|
||||
var indexOf = line.IndexOf(' ', StringComparison.Ordinal);
|
||||
var indexOf = line.IndexOfOrdinal(' ');
|
||||
|
||||
list.m_Type = AssemblyHandler.FindFirstTypeForName(line.Substring(0, indexOf++), true);
|
||||
|
||||
|
|
@ -1258,14 +1258,14 @@ namespace Server.Commands
|
|||
}
|
||||
|
||||
line = line.Substring(indexOf);
|
||||
indexOf = line.IndexOf('(', StringComparison.Ordinal);
|
||||
indexOf = line.IndexOfOrdinal('(');
|
||||
if (indexOf >= 0)
|
||||
{
|
||||
list.m_ItemID = Utility.ToInt32(line.Substring(0, indexOf - 1));
|
||||
|
||||
var parms = line.Substring(++indexOf);
|
||||
|
||||
if (line.EndsWith(")", StringComparison.Ordinal))
|
||||
if (line.EndsWithOrdinal(")"))
|
||||
{
|
||||
parms = parms.Substring(0, parms.Length - 1);
|
||||
}
|
||||
|
|
@ -1294,7 +1294,7 @@ namespace Server.Commands
|
|||
break;
|
||||
}
|
||||
|
||||
if (line.StartsWith("#", StringComparison.Ordinal))
|
||||
if (line.StartsWithOrdinal("#"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1324,7 +1324,7 @@ namespace Server.Commands
|
|||
|
||||
public void Pop(out string v, ref string line)
|
||||
{
|
||||
var space = line.IndexOf(' ', StringComparison.Ordinal);
|
||||
var space = line.IndexOfOrdinal(' ');
|
||||
|
||||
if (space >= 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ namespace Server.Commands
|
|||
}
|
||||
}
|
||||
|
||||
private static bool CIEqual(string l, string r) => Insensitive.Equals(l, r);
|
||||
private static bool CIEqual(string l, string r) => l.InsensitiveEquals(r);
|
||||
|
||||
public static CPA GetCPA(PropertyInfo p)
|
||||
{
|
||||
|
|
@ -254,7 +254,7 @@ namespace Server.Commands
|
|||
{
|
||||
var valueString = args[1 + i * 2];
|
||||
|
||||
if (valueString.StartsWith("0x", StringComparison.Ordinal))
|
||||
if (valueString.StartsWithOrdinal("0x"))
|
||||
{
|
||||
realValues[i] = Convert.ToInt32(valueString.Substring(2), 16);
|
||||
}
|
||||
|
|
@ -483,7 +483,7 @@ namespace Server.Commands
|
|||
{
|
||||
toSet = null;
|
||||
}
|
||||
else if (value.StartsWith("0x", StringComparison.Ordinal) && IsNumeric(type))
|
||||
else if (value.StartsWithOrdinal("0x") && IsNumeric(type))
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ namespace Server.Commands
|
|||
|
||||
Item sign;
|
||||
|
||||
if (name.StartsWith("#", StringComparison.Ordinal))
|
||||
if (name.StartsWithOrdinal("#"))
|
||||
{
|
||||
sign = new LocalizedSign(itemID, Utility.ToInt32(name.Substring(1)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using Server.Commands;
|
||||
|
|
@ -715,7 +716,7 @@ namespace Server
|
|||
|
||||
if (m_Buffer == null || length > m_Buffer.Length)
|
||||
{
|
||||
m_Buffer = new byte[length];
|
||||
m_Buffer = GC.AllocateUninitializedArray<byte>(length);
|
||||
}
|
||||
|
||||
mulStream.Read(m_Buffer, 0, length);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue