1.3.1 update

Author: SignatureBeef

Binaries/OTA.Commands.dll

@@ -18,6 +18,8 @@
 #-lobby <friends> or <private>             Allows friends to join the server or sets it to private if Steam is enabled
 #-ip <ip address>	Sets the IP address for the server to listen on
 #-forcepriority <priority>	Sets the process priority for this task. If this is used the "priority" setting below will be ignored.
+#-disableannouncementbox   Disables the text announcements Announcement Box makes when pulsed from wire.
+#-announcementboxrange <number>   Sets the announcement box text messaging range in pixels, -1 for serverwide announcements.
 
 #remove the # in front of commands to enable them.
 

Binaries/OTA.Patcher.exe

@@ -5,4 +5,4 @@ TerrariaServer.exe -config server.config
 @echo.
 @echo Restarting server...
 @echo.
-goto start
+goto start

Binaries/OTA.Patcher.pdb

@@ -26,6 +26,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <DefineConstants>DAPPER</DefineConstants>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
@@ -166,12 +168,13 @@
       <HintPath>..\Open-Terraria-API\Binaries\Libraries\KopiLua.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Collections.Concurrent" />
     <Reference Include="TerrariaServer">
       <HintPath>..\Open-Terraria-API\Binaries\Server\TerrariaServer.exe</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Concurrent" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Core\Command\Commands\ConnectionCommand.cs" />
     <Compile Include="Core\Command\Commands\DebugCommand.cs" />
     <Compile Include="Core\Command\Commands\ChangePasswordCommand.cs" />
     <Compile Include="Core\Command\Commands\PrivateMessageCommand.cs" />

Binaries/OTA.dll

@@ -0,0 +1,65 @@
+using System;
+using OTA;
+using OTA.Command;
+using Terraria;
+using System.Linq;
+
+namespace TDSM.Core.Command.Commands
+{
+    public class ConnectionCommand : CoreCommand
+    {
+        public override void Initialise()
+        {
+            AddCommand("conn")
+                .WithAccessLevel(AccessLevel.OP)
+                .WithPermissionNode("tdsm.conn")
+                .WithHelpText("count")
+                .WithHelpText("kill <slot>")
+                .WithHelpText("check")
+                .Calls((ISender sender, ArgumentList args) =>
+                {
+                    switch (args.GetString(0).ToLower())
+                    {
+                        case "count":
+                            sender.Message("Active connectons: " + (Netplay.Clients.Count(x => x.IsActive)));
+                            break;
+
+                        case "kill":
+                            var at = args.GetInt(1);
+                            var client = Netplay.Clients[at];
+                            if (client != null && client.IsActive)
+                            {
+                                client.PendingTermination = true;
+                            }
+                            break;
+
+                        case "check":
+                            for (var i = 0; i < Main.player.Length; i++)
+                            {
+                                var player = Main.player[i];
+                                var conn = Netplay.Clients[i];
+
+                                if (conn == null && player == null) continue;
+                                if (player != null && conn != null)
+                                {
+                                    if (player.active != conn.IsActive)
+                                    {
+                                        sender.Message($"Slot {i}, player active: {player.active}, conn active: {conn.IsActive}.");
+                                    }
+                                }
+                                else if (player == null && conn.IsActive)
+                                {
+                                    sender.Message($"Player at slot {i} is null, but the connection instance is active.");
+                                }
+                                else if (conn == null && player.active)
+                                {
+                                    sender.Message($"Connection at slot {i} is null, but the player instance is active.");
+                                }
+                            }
+                            break;
+                    }
+                });
+        }
+    }
+}
+

Binaries/OTA.pdb

@@ -107,7 +107,7 @@ public void ServerList(ISender sender, ArgumentList args)
                         sender.SendMessage("Last beat: " + Heartbeat.LastBeat);
                     else
                         sender.SendMessage("Last beat: n/a");
-                    sender.SendMessage("Server list " + (Heartbeat.PublishToList ? "public" : "private"));
+                    sender.SendMessage("Server list is " + (Heartbeat.PublishToList ? "public" : "private"));
                     sender.SendMessage("Current name: " + Heartbeat.ServerName);
                     sender.SendMessage("Current domain: " + Heartbeat.ServerDomain);
                     sender.SendMessage("Current description: " + Heartbeat.ServerDescription);

Binaries/Plugins/OTA.Commands.dll

@@ -19,6 +19,12 @@ namespace TDSM.Core
 {
     public partial class Entry
     {
+        [Hook]
+        private void OnSetTitle(ref HookContext ctx, ref HookArgs.SetWindowTitle args)
+        {
+            ctx.SetResult( HookResult.RECTIFY, resultParam: $"{args.Title} | TDSM ({Entry.CoreVersion}) , OTAPI ({Globals.BuildInfo})");
+        }
+
         [Hook(HookOrder.LATE)]
         private void Command(ref HookContext ctx, ref TDSMHookArgs.ServerCommand args)
         {

Binaries/Plugins/OTA.Commands.pdb

@@ -3,7 +3,7 @@
 
 namespace TDSM.Core.Data.Models.Migrations
 {
-    [OTAMigration(1, typeof(Core.Entry))]
+    [OTAMigration(1, typeof(Entry))]
     public partial class CreateAndSeed : Migration
     {
         public override void Up()

Binaries/Plugins/TDSM.Core.dll

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <DefinitionFileOfItemInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Version>3</Version>
   <Data>
@@ -15893,9 +15893,9 @@
     <ItemInfo>
       <Id>414</Id>
       <NetId>414</NetId>
-      <Affix>Mudstone Block</Affix>
+      <Affix>Mudstone Brick</Affix>
       <Prefix>0</Prefix>
-      <Name>Mudstone Block</Name>
+      <Name>Mudstone Brick</Name>
       <MaxStack>999</MaxStack>
     </ItemInfo>
     <ItemInfo>
@@ -20682,6 +20682,14 @@
       <Name>Red Torch</Name>
       <MaxStack>99</MaxStack>
     </ItemInfo>
+    <ItemInfo>
+      <Id>509</Id>
+      <NetId>509</NetId>
+      <Affix>Red Wrench</Affix>
+      <Prefix>0</Prefix>
+      <Name>Red Wrench</Name>
+      <MaxStack>1</MaxStack>
+    </ItemInfo>
     <ItemInfo>
       <Id>667</Id>
       <NetId>667</NetId>
@@ -28018,14 +28026,6 @@
       <Name>Wrath Potion</Name>
       <MaxStack>30</MaxStack>
     </ItemInfo>
-    <ItemInfo>
-      <Id>509</Id>
-      <NetId>509</NetId>
-      <Affix>Wrench</Affix>
-      <Prefix>0</Prefix>
-      <Name>Wrench</Name>
-      <MaxStack>1</MaxStack>
-    </ItemInfo>
     <ItemInfo>
       <Id>1700</Id>
       <NetId>1700</NetId>

Binaries/Plugins/TDSM.Core.pdb

@@ -30,19 +30,19 @@ public static void Detach(Entry plugin)
 
         /// <summary>
         /// This class is used to isolate the mono specific code into it's own container.
-        /// The Sigterm class is used to check what platform is running with triggering
-        /// a load of the Mono.Posix dll.
+        /// The Sigterm class is used to check what platform is running without triggering
+        /// a load of the Mono.Posix dll. Calling this class will trigger the load.
         /// </summary>
         internal static class MonoSigterm
         {
-            private static bool _attached;
-            private static Thread signal_thread;
+            private static bool _attached, _exiting;
+            private static Thread _signal_thread;
 
             public static void Attach(Entry plugin)
             {
                 try
                 {
-                    if (!_attached)
+                    if (!_exiting && !_attached)
                     {
                         _attached = true;
                         // Catch SIGINT, SIGUSR1 and SIGTERM
@@ -53,44 +53,52 @@ public static void Attach(Entry plugin)
                             new UnixSignal(Signum.SIGTERM)
                         };
 
-                        (signal_thread = new Thread(delegate ()
+                        (_signal_thread = new Thread(() =>
                         {
                             System.Threading.Thread.CurrentThread.Name = "SIG";
-                            while (!Terraria.Netplay.disconnect && _attached)
+                            try
                             {
-                                // Wait for a signal to be delivered
-                                var index = UnixSignal.WaitAny(signals, -1);
-                                var signal = signals[index].Signum;
-
-                                if (!Terraria.Netplay.disconnect && _attached)
+                                while (!Terraria.Netplay.disconnect && _attached)
                                 {
-                                    _attached = false;
-                                    OTA.Logging.ProgramLog.Log("Server received Exit Signal");
+                                    // Wait for a signal to be delivered
+                                    if (UnixSignal.WaitAll(signals, 250))
+                                    {
+                                        if (!Terraria.Netplay.disconnect && _attached)
+                                        {
+                                            _attached = false;
+                                            OTA.Logging.ProgramLog.Log("Server received Exit Signal");
 
-                                    Terraria.IO.WorldFile.saveWorld(false);
-                                    Terraria.Netplay.disconnect = true;
+                                            Terraria.IO.WorldFile.saveWorld(false);
+                                            Terraria.Netplay.disconnect = true;
+                                        }
+                                    }
                                 }
+
+                                OTA.Logging.ProgramLog.Debug.Log("Sigterm thread exiting");
+                            }
+                            catch (System.Exception e)
+                            {
+                                OTA.Logging.ProgramLog.Log(e, "Sigterm exception");
                             }
                         })).Start();
                     }
-
-                    OTA.Logging.ProgramLog.Log("Server can accept SIGTERM");
                 }
                 catch
                 {
-                    OTA.Logging.ProgramLog.Log("Failed to attatch SIGTERM listener");
+                    OTA.Logging.ProgramLog.Log("Failed to attach Sigterm listener");
                 }
             }
 
             public static void Detach(Entry plugin)
             {
-                _attached = false;
-                try
-                {
-                    signal_thread.Abort();
-                }
-                catch
+                if (_attached && _signal_thread != null)
                 {
+                    _attached = false;
+                    _exiting = true;
+
+                    //Instead of killing the thread, wait for it to exit.
+                    _signal_thread.Join();
+                    _signal_thread = null;
                 }
             }
         }