warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Targets .NET Core 3.0 (#39)

Browse source
This commit is contained in:
Kamron Batman 2019-08-02 17:53:18 -07:00 • committed by GitHub
parent 0993c03b70
commit 08bf44af9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
125 changed files with 1473 additions and 14244 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scripts/Commands/Add.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using Server.Items;

1
Scripts/Commands/Docs.cs
View file

@ -28,7 +28,6 @@ namespace Server.Commands
World.Broadcast(0x35, true, "Documentation is being generated, please wait.");
Console.WriteLine("Documentation is being generated, please wait.");
NetState.FlushAll();
NetState.Pause();
DateTime startTime = DateTime.UtcNow;

4
Scripts/Commands/Generic/Extensions/Compilers/ConditionalCompiler.cs
View file

@ -160,6 +160,10 @@ namespace Server.Commands.Generic
FieldAttributes.Private | FieldAttributes.InitOnly
);
// parseMethod.Invoke(null,
// parseArgs.Length == 2 ? new object[] {toParse, (int) parseArgs[1]} : new object[] {toParse});
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldstr, toParse);

6
Scripts/Commands/Generic/Extensions/DistinctExtension.cs
View file

@ -6,7 +6,7 @@ namespace Server.Commands.Generic
public sealed class DistinctExtension : BaseExtension
{
public static ExtensionInfo ExtInfo =
new ExtensionInfo(30, "Distinct", -1, delegate { return new DistinctExtension(); });
new ExtensionInfo(30, "Distinct", -1, () => new DistinctExtension());
private IComparer<object> m_Comparer;
@ -36,7 +36,7 @@ namespace Server.Commands.Generic
}
if (assembly == null)
assembly = new AssemblyEmitter("__dynamic", false);
assembly = new AssemblyEmitter("__dynamic");
m_Comparer = DistinctCompiler.Compile<object>(assembly, baseType, m_Properties.ToArray());
}
@ -81,4 +81,4 @@ namespace Server.Commands.Generic
}
}
}
}
}

4
Scripts/Commands/Generic/Extensions/SortExtension.cs
View file

@ -35,7 +35,7 @@ namespace Server.Commands.Generic
}
if (assembly == null)
assembly = new AssemblyEmitter("__dynamic", false);
assembly = new AssemblyEmitter("__dynamic");
m_Comparer = SortCompiler.Compile<object>(assembly, baseType, m_Orders.ToArray());
}
@ -100,4 +100,4 @@ namespace Server.Commands.Generic
list.Sort(m_Comparer);
}
}
}
}

5
Scripts/Commands/Generic/Implementors/ObjectConditional.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using CPA = Server.CommandPropertyAttribute;
namespace Server.Commands.Generic
{
@ -32,7 +31,7 @@ namespace Server.Commands.Generic
public void Compile(ref AssemblyEmitter emitter)
{
if (emitter == null)
emitter = new AssemblyEmitter("__dynamic", false);
emitter = new AssemblyEmitter("__dynamic");
m_Conditionals = new IConditional[m_Conditions.Length];
@ -247,4 +246,4 @@ namespace Server.Commands.Generic
return new ObjectConditional(objectType, conditions.ToArray());
}
}
}
}