Changeset 189 for binary-improvements

Timestamp:

Sep 12, 2014, 11:14:11 AM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/MapRendering/MapRendering.cs (modified) (5 diffs)
• 7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/PersistentData/Inventory.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/PersistentData/Players.cs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)
• webserver/js/index.js (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs

@@ -2 +2 @@
 using System;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace AllocsFixes.CustomCommands
@@ -24 +25 @@
                 {
                         try {
-                                if (_params.Length != 4) {
+                                if (_params.Length != 4 && _params.Length != 2) {
                                         m_Console.SendResult ("Usage: teleportplayer <entityid|playername|steamid> <x> <y> <z>");
+                                        m_Console.SendResult ("   or: teleportplayer <entityid|playername|steamid> <target entityid|playername|steamid>");
                                 } else {
-                                        string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true);
-                                        if (steamid == null) {
+                                        Player p1 = PersistentContainer.Instance.Players.GetPlayerByNameOrId (_params [0], true);
+                                        if (p1 == null) {
                                                 m_Console.SendResult ("Playername or entity/steamid id not found.");
                                                 return;
                                         }
-
-                                        Player p = PersistentContainer.Instance.Players [steamid];
-                                        if (!p.IsOnline) {
+                                        if (!p1.IsOnline) {
                                                 m_Console.SendResult ("Player not online.");
                                                 return;
                                         }
 
-                                        int x = int.MinValue;
-                                        int.TryParse (_params [1], out x);
-                                        int y = int.MinValue;
-                                        int.TryParse (_params [2], out y);
-                                        int z = int.MinValue;
-                                        int.TryParse (_params [3], out z);
+                                        if (_params.Length == 4) {
+                                                int x = int.MinValue;
+                                                int y = int.MinValue;
+                                                int z = int.MinValue;
 
-                                        if (x == int.MinValue || y == int.MinValue || z == int.MinValue) {
-                                                m_Console.SendResult ("At least one of the given coordinates is not a valid integer");
-                                                return;
+                                                int.TryParse (_params [1], out x);
+                                                int.TryParse (_params [2], out y);
+                                                int.TryParse (_params [3], out z);
+
+                                                if (x == int.MinValue || y == int.MinValue || z == int.MinValue) {
+                                                        m_Console.SendResult ("At least one of the given coordinates is not a valid integer");
+                                                        return;
+                                                }
+
+                                                p1.Entity.position.x = x;
+                                                p1.Entity.position.y = y;
+                                                p1.Entity.position.z = z;
+                                        } else {
+                                                Player p2 = PersistentContainer.Instance.Players.GetPlayerByNameOrId (_params [1], true);
+                                                if (p2 == null) {
+                                                        m_Console.SendResult ("Target playername or entity/steamid id not found.");
+                                                        return;
+                                                }
+                                                if (!p2.IsOnline) {
+                                                        m_Console.SendResult ("Target player not online.");
+                                                        return;
+                                                }
+
+                                                p1.Entity.position = p2.Entity.GetPosition();
                                         }
 
-                                        p.Entity.position.x = x;
-                                        p.Entity.position.y = y;
-                                        p.Entity.position.z = z;
-                                        NetPackage_EntityPosAndRot pkg = new NetPackage_EntityPosAndRot (p.Entity);
+                                        NetPackage_EntityPosAndRot pkg = new NetPackage_EntityPosAndRot (p1.Entity);
 
-                                        p.ClientInfo.netConnection [0].Send (pkg);
+                                        p1.ClientInfo.netConnection [0].Send (pkg);
                                 }
                         } catch (Exception e) {

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs

@@ -37 +37 @@
                 {
                         bool res = false;
-                        Monitor.Enter (blockMap);
-                        try {
+                        lock (blockMap) {
                                 string folder = Constants.MAP_DIRECTORY + "/" + (zoomLevel) + "/" + block.x;
                                 string fileName = folder + "/" + block.y + ".png";
@@ -48 +47 @@
                                 }
                                 currentBlockMap = fileName;
-                        } finally {
-                                Monitor.Exit (blockMap);
                         }
                         return res;

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

@@ -55 +55 @@
                                         try {
                                                 if (!Instance.renderingFullMap) {
-                                                        Monitor.Enter (Instance.zoomLevelBuffers);
-                                                        try {
+                                                        lock (Instance.zoomLevelBuffers) {
                                                                 Chunk c = (Chunk)o;
                                                                 Vector3i cPos = c.GetWorldPos ();
@@ -72 +71 @@
                                                                         Instance.chunkSaveTimer.Start ();
                                                                 }
-                                                        } finally {
-                                                                Monitor.Exit (Instance.zoomLevelBuffers);
                                                         }
                                                 }
@@ -103 +100 @@
                         );
 
-                        Monitor.Enter (Instance.zoomLevelBuffers);
-                        try {
+                        lock (Instance.zoomLevelBuffers) {
                                 for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
                                         zoomLevelBuffers [i].ResetBlock ();
@@ -152 +148 @@
                                         Log.Out (String.Format ("RenderMap: {0}/{1} ({2}%)", curFullMapPos.x, widthPix, (int)((float)curFullMapPos.x / widthPix * 100)));
                                 }
-                        } finally {
-                                Monitor.Exit (Instance.zoomLevelBuffers);
                         }
 
@@ -178 +172 @@
                 private void TimedRendering (object source, System.Timers.ElapsedEventArgs e)
                 {
-                        Monitor.Enter (zoomLevelBuffers);
-                        try {
+                        lock (zoomLevelBuffers) {
                                 RenderDirtyChunks ();
                                 if (dirtyChunks.Count > 0)
                                         Instance.chunkSaveTimer.Start ();
-                        } finally {
-                                Monitor.Exit (zoomLevelBuffers);
                         }
                 }

binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

@@ -28 +28 @@
                         Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
 
-                        object obj = netCommandQueue;
-                        Monitor.Enter (obj);
-                        try {
+                        lock (netCommandQueue) {
                                 isCurrentCommandFromClient = true;
                                 console.issuerOfCurrentClientCommand = _networkPlayer;
                                 console.ExecuteClientCmdInternal (_playerID, _command);
                                 isCurrentCommandFromClient = false;
-                        } finally {
-                                Monitor.Exit (obj);
                         }
 
@@ -61 +57 @@
                 {
                         if (netCommandQueue.Count > 0) {
-                                object obj = netCommandQueue;
-                                Monitor.Enter (obj);
-                                try {
+                                lock (netCommandQueue) {
                                         issuerOfCurrentCommand = netCommandQueue [0].client;
-                                        console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        try {
+                                                console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        } catch (Exception e) {
+                                                Log.Out("Exception while executing command: " + e);
+                                        }
                                         netCommandQueue.RemoveAt (0);
                                         issuerOfCurrentCommand = null;
-                                } finally {
-                                        Monitor.Exit (obj);
                                 }
                         }
@@ -76 +72 @@
                 public static void QueueNetCommand (string _line, IConnection _con)
                 {
-                        object obj = netCommandQueue;
-                        Monitor.Enter (obj);
-                        try {
+                        lock (netCommandQueue) {
                                 netCommandQueue.Add (new NetCommand (_line, _con));
-                        } finally {
-                                Monitor.Exit (obj);
                         }
                 }

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs

@@ -38 +38 @@
 
                         if (endpoint is IPEndPoint) {
-                                endpointAddressHash = ((IPEndPoint)endpoint).Address.GetHashCode();
+                                endpointAddressHash = ((IPEndPoint)endpoint).Address.GetHashCode ();
                                 //Log.Out ("Hash: " + endpointAddressHash);
                         } else {
-                                Log.Out ("EndPoint is not an IPEndPoint but: " + endpoint.GetType().ToString());
+                                Log.Out ("EndPoint is not an IPEndPoint but: " + endpoint.GetType ().ToString ());
                         }
 
@@ -78 +78 @@
                                         while (!IsClosed()) {
                                                 string line = reader.ReadLine ();
-                                                if (line != null) {
+                                                if (line != null && line.Length > 0) {
                                                         line = line.Trim ();
-
-                                                        if (!IsAuthenticated ()) {
-                                                                if (line.Equals (GamePrefs.GetString (EnumGamePrefs.TelnetPassword))) {
-                                                                        authenticated = true;
-                                                                        WriteLine ("Logon successful.");
-                                                                        WriteLine (string.Empty);
-                                                                        WriteLine (string.Empty);
-                                                                        WriteLine (string.Empty);
-                                                                        LoginMessage ();
+                                                        if (line.Length > 0) {
+                                                                if (!IsAuthenticated ()) {
+                                                                        if (line.Equals (GamePrefs.GetString (EnumGamePrefs.TelnetPassword))) {
+                                                                                authenticated = true;
+                                                                                WriteLine ("Logon successful.");
+                                                                                WriteLine (string.Empty);
+                                                                                WriteLine (string.Empty);
+                                                                                WriteLine (string.Empty);
+                                                                                LoginMessage ();
+                                                                        } else {
+                                                                                if (owner.RegisterFailedLogin (endpointAddressHash)) {
+                                                                                        WriteLine ("Password incorrect, please enter password:");
+                                                                                } else {
+                                                                                        WriteLine ("Too many failed login attempts!");
+                                                                                        Thread.Sleep (100);
+                                                                                        Close ();
+                                                                                        Log.Out ("Telnet connection closed for too many login attempts: " + endpoint);
+                                                                                        break;
+                                                                                }
+                                                                        }
                                                                 } else {
-                                                                        if (owner.RegisterFailedLogin(endpointAddressHash)) {
-                                                                                WriteLine ("Password incorrect, please enter password:");
-                                                                        } else {
-                                                                                WriteLine ("Too many failed login attempts!");
-                                                                                Thread.Sleep(100);
+                                                                        if (line.ToLower ().Equals ("exit")) {
+                                                                                Log.Out ("Telnet connection closed by client: " + endpoint);
                                                                                 Close ();
-                                                                                Log.Out ("Telnet connection closed for too many login attempts: " + endpoint);
                                                                                 break;
                                                                         }
+                                                                        Log.Out ("Telnet executed \"" + line + "\" from: " + endpoint);
+                                                                        ConsoleOutputSeparator.QueueNetCommand (line, this);
                                                                 }
-                                                        } else {
-                                                                if (line.ToLower ().Equals ("exit")) {
-                                                                        Log.Out ("Telnet connection closed by client: " + endpoint);
-                                                                        Close ();
-                                                                        break;
-                                                                }
-                                                                Log.Out ("Telnet executed \"" + line + "\" from: " + endpoint);
-                                                                ConsoleOutputSeparator.QueueNetCommand (line, this);
                                                         }
                                                 }

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs

@@ -30 +30 @@
                                 byte[] content;
                                 if (cache) {
-                                        Monitor.Enter (fileCache);
-                                        try {
+                                        lock (fileCache) {
                                                 if (!fileCache.ContainsKey (fn)) {
                                                         if (!File.Exists (datapath + "/" + fn)) {
@@ -41 +40 @@
 
                                                 content = fileCache [fn];
-                                        } finally {
-                                                Monitor.Exit (fileCache);
                                         }
                                 } else {
@@ -55 +52 @@
                                 resp.ContentLength64 = content.Length;
                                 resp.OutputStream.Write (content, 0, content.Length);
-                        } catch (FileNotFoundException e) {
+                        } catch (FileNotFoundException) {
                                 resp.StatusCode = (int)HttpStatusCode.NotFound;
                                 if (logMissingFiles)

binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -27 +27 @@
                 private void ProcessInv (List<InvItem> target, InventoryField[] sourceFields)
                 {
-                        Monitor.Enter (target);
-                        try {
+                        lock (target) {
                                 target.Clear ();
                                 for (int i = 0; i < sourceFields.Length; i++) {
@@ -40 +39 @@
                                         }
                                 }
-                        } finally {
-                                Monitor.Exit (target);
                         }
                 }

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -45 +45 @@
                 }
 
+                public Player GetPlayerByNameOrId (string _nameOrId, bool _ignoreColorCodes)
+                {
+                        string sid = GetSteamID(_nameOrId, _ignoreColorCodes);
+                        if (sid != null)
+                                return this[sid];
+                        else
+                                return null;
+                }
+
                 public string GetSteamID (string _nameOrId, bool _ignoreColorCodes)
                 {

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.93.5366.36263
+Version:       0.93.5368.20218

binary-improvements/webserver/js/index.js

@@ -159 +159 @@
                 }
 
-                var pos = tileLeft;
-
         }
 
@@ -295 +293 @@
                 collapsed: false
         }).addTo(map);
-
-        //map.on('mousemove', function(e) {
-        //      L.DomUtil.get('pos').textContent = FormatCoord(e.latlng);
-        //});
 
         var miniMap = new L.Control.MiniMap(tileLayerMiniMap, {