Targets .NET Core 3.0 (#39)

Scripts/Misc/Assistants.cs

@@ -88,11 +88,11 @@ namespace Server.Misc
 
       public static void Initialize()
       {
-        if (Settings.Enabled)
+/*        if (Settings.Enabled)
         {
           EventSink.Login += EventSink_Login;
           ProtocolExtensions.Register(0xFF, true, OnHandshakeResponse);
-        }
+        }*/
       }
 
       private static void EventSink_Login(LoginEventArgs e)

Scripts/Misc/Broadcasts.cs

@@ -22,14 +22,14 @@ namespace Server.Misc
 
     public static void EventSink_Shutdown(ShutdownEventArgs e)
     {
-      try
+/*      try
       {
         World.Broadcast(0x35, true, "The server has shut down.");
       }
       catch
       {
         // ignored
-      }
+      }*/
     }
   }
-}
+}

Scripts/Misc/DataPath.cs

@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using Microsoft.Win32;
 
 namespace Server.Misc
 {
@@ -12,7 +10,8 @@ namespace Server.Misc
      * Example:
      *  private static string CustomPath = @"C:\Program Files\Ultima Online";
      */
-    private static string CustomPath = null;
+    private static string CustomPath = @"C:\Ultima Online Classic";
+    // private static string CustomPath = @"/Users/kamronbatman/UOC";
 
     /* The following is a list of files which a required for proper execution:
      *
@@ -69,7 +68,8 @@ namespace Server.Misc
 
     private static string GetPath(string subName, string keyName)
     {
-      try
+      return null;
+      /*try
       {
         string keyString;
 
@@ -102,7 +102,7 @@ namespace Server.Misc
       catch
       {
         return null;
-      }
+      }*/
     }
   }
-}
+}

Scripts/Misc/DoorGenerator.cs

@@ -349,7 +349,6 @@ namespace Server
     {
       World.Broadcast(0x35, true, "Generating doors, please wait.");
 
-      NetState.FlushAll();
       NetState.Pause();
 
       m_Map = Map.Trammel;
@@ -555,4 +554,4 @@ namespace Server
       }
     }
   }
-}
+}

Scripts/Misc/Emitter.cs

@@ -13,45 +13,24 @@ namespace Server
 		private AssemblyBuilder m_AssemblyBuilder;
 		private ModuleBuilder m_ModuleBuilder;
 
-		public AssemblyEmitter( string assemblyName, bool canSave )
+		public AssemblyEmitter( string assemblyName )
 		{
 			m_AssemblyName = assemblyName;
 
 			m_AppDomain = AppDomain.CurrentDomain;
 
-			m_AssemblyBuilder = m_AppDomain.DefineDynamicAssembly(
+			m_AssemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(
 				new AssemblyName( assemblyName ),
-				canSave ? AssemblyBuilderAccess.RunAndSave : AssemblyBuilderAccess.Run
+				AssemblyBuilderAccess.Run
 			);
 
-			if ( canSave )
-			{
-				m_ModuleBuilder = m_AssemblyBuilder.DefineDynamicModule(
-					assemblyName,
-					$"{assemblyName.ToLower()}.dll",
-					false
-				);
-			}
-			else
-			{
-				m_ModuleBuilder = m_AssemblyBuilder.DefineDynamicModule(
-					assemblyName,
-					false
-				);
-			}
+      m_ModuleBuilder = m_AssemblyBuilder.DefineDynamicModule(assemblyName);
 		}
 
 		public TypeBuilder DefineType( string typeName, TypeAttributes attrs, Type parentType )
 		{
 			return m_ModuleBuilder.DefineType( typeName, attrs, parentType );
 		}
-
-		public void Save()
-		{
-			m_AssemblyBuilder.Save(
-				$"{m_AssemblyName.ToLower()}.dll"
-			);
-		}
 	}
 
 	public class MethodEmitter

Scripts/Misc/ProfanityProtection.cs

@@ -96,9 +96,7 @@ namespace Server.Misc
           return true;
         case ProfanityAction.Disconnect:
         {
-          NetState ns = from.NetState;
-
-          ns?.Dispose();
+          from.NetState?.Dispose();
 
           return false;
         }

Scripts/Misc/ServerList.cs

@@ -80,8 +80,9 @@ namespace Server.Misc
 
         e.AddServer(ServerName, new IPEndPoint(localAddress, localPort));
       }
-      catch
+      catch (Exception er)
       {
+        Console.WriteLine(er);
         e.Rejected = true;
       }
     }
@@ -206,4 +207,4 @@ namespace Server.Misc
       }
     }
   }
-}
+}

Scripts/Misc/SocketOptions.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Net;
 using System.Net.Sockets;
 using Server.Network;
@@ -7,7 +8,6 @@ namespace Server
   public class SocketOptions
   {
     private const bool NagleEnabled = false; // Should the Nagle algorithm be enabled? This may reduce performance
-    private const int CoalesceBufferSize = 512; // MSS that the core will use when buffering packets
 
     private static IPEndPoint[] m_ListenerEndPoints =
     {
@@ -20,11 +20,13 @@ namespace Server
 
     public static void Initialize()
     {
-      SendQueue.CoalesceBufferSize = CoalesceBufferSize;
-
       EventSink.SocketConnect += EventSink_SocketConnect;
+    }
 
-      Listener.EndPoints = m_ListenerEndPoints;
+    public static void RegisterListeners()
+    {
+      for (int i = 0; i < m_ListenerEndPoints.Length; i++)
+        Core.MessagePump.AddListener(m_ListenerEndPoints[i]);
     }
 
     private static void EventSink_SocketConnect(SocketConnectEventArgs e)
@@ -36,4 +38,4 @@ namespace Server
         e.Socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.NoDelay, 1); // RunUO uses its own algorithm
     }
   }
-}
+}