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

Cleanup (#131)

Browse source
This commit is contained in:
Kamron Batman 2020-05-04 15:16:27 -07:00 • committed by GitHub
parent eb2a9a0016
commit b7c422e4ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -15,6 +15,7 @@
/Distribution/System.Runtime.CompilerServices.Unsafe.dll /Distribution/System.Runtime.CompilerServices.Unsafe.dll
/Distribution/Data/modernuo.json /Distribution/Data/modernuo.json
/Distribution/runtimes /Distribution/runtimes
/Distribution/nohup.out
# LibUv Dependencies # LibUv Dependencies
/Distribution/libuv.dylib /Distribution/libuv.dylib

20
Projects/Server/Main.cs
View file

@ -292,7 +292,7 @@ namespace Server
Closing = true; Closing = true;
Console.WriteLine("Exiting..."); Console.Write("Exiting...");
World.WaitForWriteCompletion(); World.WaitForWriteCompletion();
@ -458,7 +458,8 @@ namespace Server
VerifySerialization(ca); VerifySerialization(ca);
foreach (var a in AssemblyHandler.Assemblies.Where(a => a != ca)) VerifySerialization(a); foreach (var a in AssemblyHandler.Assemblies)
if (a != ca) VerifySerialization(a);
} }
private static void VerifyType(Type t) private static void VerifyType(Type t)
@ -479,7 +480,6 @@ namespace Server
if (t.GetConstructor(m_SerialTypeArray) == null) if (t.GetConstructor(m_SerialTypeArray) == null)
{ {
warningSb = new StringBuilder(); warningSb = new StringBuilder();
warningSb.AppendLine(" - No serialization constructor"); warningSb.AppendLine(" - No serialization constructor");
} }
@ -490,18 +490,15 @@ namespace Server
null) null)
{ {
warningSb ??= new StringBuilder(); warningSb ??= new StringBuilder();
warningSb.AppendLine(" - No Serialize() method"); warningSb.AppendLine(" - No Serialize() method");
} }
if ( if (t.GetMethod(
t.GetMethod( "Deserialize",
"Deserialize", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly) ==
BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly) == null)
null)
{ {
warningSb ??= new StringBuilder(); warningSb ??= new StringBuilder();
warningSb.AppendLine(" - No Deserialize() method"); warningSb.AppendLine(" - No Deserialize() method");
} }
@ -589,8 +586,7 @@ namespace Server
public override void Write(char ch) public override void Write(char ch)
{ {
using var writer = using var writer = new StreamWriter(new FileStream(FileName, FileMode.Append, FileAccess.Write, FileShare.Read));
new StreamWriter(new FileStream(FileName, FileMode.Append, FileAccess.Write, FileShare.Read));
if (m_NewLine) if (m_NewLine)
{ {
writer.Write(DateTime.UtcNow.ToString(DateFormat)); writer.Write(DateTime.UtcNow.ToString(DateFormat));

4
Projects/Server/Network/Packets/OldPackets/VendorBuyPackets.cs
View file

@ -55,10 +55,6 @@ namespace Server.Network
Stream.Write((short)list.Count); Stream.Write((short)list.Count);
// The client sorts these by their X/Y value.
// OSI sends these in weird order. X/Y highest to lowest and serial loewst to highest
// These are already sorted by serial (done by the vendor class) but we have to send them by x/y
// (the x74 packet is sent in 'correct' order.)
for (var i = list.Count - 1; i >= 0; --i) for (var i = list.Count - 1; i >= 0; --i)
{ {
var bis = list[i]; var bis = list[i];