diff --git a/.gitignore b/.gitignore index 23f4efad6..cce99125e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ /Distribution/System.Runtime.CompilerServices.Unsafe.dll /Distribution/Data/modernuo.json /Distribution/runtimes +/Distribution/nohup.out # LibUv Dependencies /Distribution/libuv.dylib diff --git a/Projects/Server/Main.cs b/Projects/Server/Main.cs index b2d1e2f53..7f14deaf8 100644 --- a/Projects/Server/Main.cs +++ b/Projects/Server/Main.cs @@ -292,7 +292,7 @@ namespace Server Closing = true; - Console.WriteLine("Exiting..."); + Console.Write("Exiting..."); World.WaitForWriteCompletion(); @@ -458,7 +458,8 @@ namespace Server 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) @@ -479,7 +480,6 @@ namespace Server if (t.GetConstructor(m_SerialTypeArray) == null) { warningSb = new StringBuilder(); - warningSb.AppendLine(" - No serialization constructor"); } @@ -490,18 +490,15 @@ namespace Server null) { warningSb ??= new StringBuilder(); - warningSb.AppendLine(" - No Serialize() method"); } - if ( - t.GetMethod( - "Deserialize", - BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly) == - null) + if (t.GetMethod( + "Deserialize", + BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly) == + null) { warningSb ??= new StringBuilder(); - warningSb.AppendLine(" - No Deserialize() method"); } @@ -589,8 +586,7 @@ namespace Server public override void Write(char ch) { - using var writer = - new StreamWriter(new FileStream(FileName, FileMode.Append, FileAccess.Write, FileShare.Read)); + using var writer = new StreamWriter(new FileStream(FileName, FileMode.Append, FileAccess.Write, FileShare.Read)); if (m_NewLine) { writer.Write(DateTime.UtcNow.ToString(DateFormat)); diff --git a/Projects/Server/Network/Packets/OldPackets/VendorBuyPackets.cs b/Projects/Server/Network/Packets/OldPackets/VendorBuyPackets.cs index 2a0efafbc..dd53964c3 100644 --- a/Projects/Server/Network/Packets/OldPackets/VendorBuyPackets.cs +++ b/Projects/Server/Network/Packets/OldPackets/VendorBuyPackets.cs @@ -55,10 +55,6 @@ namespace Server.Network 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) { var bis = list[i];