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:
parent
4ad8811df2
commit
525cda5413
266 changed files with 1348 additions and 1800 deletions
|
|
@ -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]);
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue