Changeset 91 for binary-improvements/7dtd-server-fixes

Timestamp:

Jul 20, 2014, 3:41:46 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.userprefs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• src/AllocsNetTelnetServer.cs (modified) (1 diff)
• src/AllocsTelnetConnection.cs (modified) (1 diff)
• src/TelnetCommands/GetGamePrefs.cs (modified) (1 diff)
• src/TelnetCommands/ListPlayersExtended.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/AllocsTelnetCommand.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="src/TelnetCommands/GetGamePrefs.cs">
     <Files>
-      <File FileName="src/AssemblyInfo.cs" Line="1" Column="1" />
-      <File FileName="src/AllocsNetTelnetServer.cs" Line="40" Column="101" />
-      <File FileName="src/AllocsTelnetConnection.cs" Line="16" Column="34" />
-      <File FileName="src/AllocsTelnetCommand.cs" Line="3" Column="4" />
+      <File FileName="src/AssemblyInfo.cs" Line="20" Column="40" />
+      <File FileName="src/AllocsNetTelnetServer.cs" Line="33" Column="1" />
+      <File FileName="src/AllocsTelnetConnection.cs" Line="44" Column="42" />
+      <File FileName="src/AllocsLogFunctions.cs" Line="27" Column="42" />
+      <File FileName="src/TelnetCommands/GetGamePrefs.cs" Line="71" Column="3" />
+      <File FileName="src/TelnetCommands/ListPlayersExtended.cs" Line="49" Column="17" />
+      <File FileName="src/TelnetCommands/SayToPlayer.cs" Line="75" Column="33" />
+      <File FileName="src/AdminToolsStuff.cs" Line="30" Column="54" />
     </Files>
   </MonoDevelop.Ide.Workbench>

binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs

@@ -91 +91 @@
                 c.WriteLine ("*** Connected with 7DTD server.");
                 c.WriteLine ("*** Server version: Alpha 8.7 (b29) Compatibility Version: Alpha 8.7");
+                c.WriteLine ("*** Allocs server fixes loaded");
                 c.WriteLine (string.Empty);
                 c.WriteLine ("Server IP:   " + 

binary-improvements/7dtd-server-fixes/src/AllocsTelnetConnection.cs

@@ -34 +34 @@
         public void WriteLine (string s)
         {
-                if (!IsClosed () && stream.CanWrite) {
-                        for (int i = 0; i < s.Length; i++) {
-                                WriteByte ((byte)s [i]);
+                try {
+                        if (!IsClosed () && stream.CanWrite) {
+                                for (int i = 0; i < s.Length; i++) {
+                                        WriteByte ((byte)s [i]);
+                                }
+                                WriteByte (10);
                         }
-                        WriteByte (10);
+                } catch (Exception e) {
+                        Log.Out("Error writing to client: " + e);
                 }
         }

binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs

@@ -45 +45 @@
         public override void Run (string[] _params)
         {
-                if (_params.Length <= 0) {
+                EnumGamePrefs enumGamePrefs = EnumGamePrefs.Last;
+
+                if (_params.Length > 0) {
+                        try {
+                                enumGamePrefs = (EnumGamePrefs)((int)Enum.Parse (typeof(EnumGamePrefs), _params [0]));
+                        } catch (Exception) {
+                        }
+                }
+
+                if (enumGamePrefs == EnumGamePrefs.Last) {
                         SortedList<string, string> sortedList = new SortedList<string, string> ();
                         foreach (EnumGamePrefs gp in Enum.GetValues(typeof(EnumGamePrefs))) {
-                                if (prefAccessAllowed (gp))
-                                        sortedList.Add (gp.ToString (), string.Format ("{0} = {1}", gp.ToString (), GamePrefs.GetObject (gp)));
+                                if ((_params.Length == 0) || (gp.ToString ().ToLower ().Contains (_params [0].ToLower ()))) {
+                                        if (prefAccessAllowed (gp)) {
+                                                sortedList.Add (gp.ToString (), string.Format ("{0} = {1}", gp.ToString (), GamePrefs.GetObject (gp)));
+                                        }
+                                }
                         }
                         foreach (string s in sortedList.Keys) {
                                 m_Console.md000a (sortedList [s]);
                         }
-                        return;
+                } else {
+                        if (prefAccessAllowed (enumGamePrefs))
+                                m_Console.md000a (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs)));
+                        else
+                                m_Console.md000a ("Access to requested preference is forbidden");
                 }
-
-                EnumGamePrefs enumGamePrefs;
-                try {
-                        enumGamePrefs = (EnumGamePrefs)((int)Enum.Parse (typeof(EnumGamePrefs), _params [0]));
-                } catch (Exception) {
-                        m_Console.md000a ("Error parsing parameter: " + _params [0]);
-                        return;
-                }
-
-                if (prefAccessAllowed (enumGamePrefs))
-                        m_Console.md000a (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs)));
-                else
-                        m_Console.md000a ("Access to requested preference is forbidden");
         }
 }

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs

@@ -60 +60 @@
                                 SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (current.Value.EntityName),
                                 ", ip=",
-                                ip
+                                ip,
+                                ", ping=",
+                                current.Value.pingToServer
                         }));
                 }