Index: binary-improvements/7dtd-server-fixes/src/API.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/API.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/API.cs (revision 325) @@ -1,8 +1,14 @@ -using System; using System.Collections.Generic; -namespace AllocsFixes -{ +namespace AllocsFixes { public class API : IModApi { + public void InitMod () { + ModEvents.GameAwake.RegisterHandler (GameAwake); + ModEvents.GameShutdown.RegisterHandler (GameShutdown); + ModEvents.SavePlayerData.RegisterHandler (SavePlayerData); + ModEvents.PlayerSpawning.RegisterHandler (PlayerSpawning); + ModEvents.PlayerDisconnected.RegisterHandler (PlayerDisconnected); + ModEvents.ChatMessage.RegisterHandler (ChatMessage); + } public void GameAwake () { @@ -13,5 +19,5 @@ StateManager.Shutdown (); } - + public void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) { PlayerDataStuff.GM_SavePlayerData (_cInfo, _playerDataFile); @@ -21,22 +27,13 @@ AllocsLogFunctions.RequestToSpawnPlayer (_cInfo, _chunkViewDim, _playerProfile); } - + public void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) { AllocsLogFunctions.PlayerDisconnected (_cInfo, _bShutdown); } - public bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName, bool _localizeMain, List _recipientEntityIds) { + public bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName, + bool _localizeMain, List _recipientEntityIds) { return ChatHookExample.Hook (_cInfo, _type, _msg, _mainName); - } - - public void InitMod () { - ModEvents.GameAwake.RegisterHandler (GameAwake); - ModEvents.GameShutdown.RegisterHandler (GameShutdown); - ModEvents.SavePlayerData.RegisterHandler (SavePlayerData); - ModEvents.PlayerSpawning.RegisterHandler (PlayerSpawning); - ModEvents.PlayerDisconnected.RegisterHandler (PlayerDisconnected); - ModEvents.ChatMessage.RegisterHandler (ChatMessage); } } } - Index: binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs (revision 325) @@ -1,24 +1,19 @@ +using System; using AllocsFixes.PersistentData; -using System; -using System.Collections.Generic; -using UnityEngine; -namespace AllocsFixes -{ - public class AllocsLogFunctions - { - public static void RequestToSpawnPlayer (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) - { +namespace AllocsFixes { + public class AllocsLogFunctions { + public static void RequestToSpawnPlayer (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) { try { Log.Out ("Player connected" + - ", entityid=" + _cInfo.entityId + - ", name=" + _cInfo.playerName + - ", steamid=" + _cInfo.playerId + - ", steamOwner=" + _cInfo.ownerId + - ", ip=" + _cInfo.ip + ", entityid=" + _cInfo.entityId + + ", name=" + _cInfo.playerName + + ", steamid=" + _cInfo.playerId + + ", steamOwner=" + _cInfo.ownerId + + ", ip=" + _cInfo.ip ); PersistentContainer.Instance.Players [_cInfo.playerId, true].SetOnline (_cInfo); - PersistentData.PersistentContainer.Instance.Save (); + PersistentContainer.Instance.Save (); } catch (Exception e) { Log.Out ("Error in AllocsLogFunctions.RequestToSpawnPlayer: " + e); @@ -26,6 +21,5 @@ } - public static void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) - { + public static void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) { try { Player p = PersistentContainer.Instance.Players [_cInfo.playerId, true]; @@ -35,5 +29,6 @@ Log.Out ("Disconnected player not found in client list..."); } - PersistentData.PersistentContainer.Instance.Save (); + + PersistentContainer.Instance.Save (); } catch (Exception e) { Log.Out ("Error in AllocsLogFunctions.PlayerDisconnected: " + e); Index: binary-improvements/7dtd-server-fixes/src/AllocsUtils.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/AllocsUtils.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/AllocsUtils.cs (revision 325) @@ -1,13 +1,10 @@ -using System; +using UnityEngine; -namespace AllocsFixes -{ +namespace AllocsFixes { public static class AllocsUtils { - - public static string ColorToHex (UnityEngine.Color _color) { - return string.Format ("{0:X02}{1:X02}{2:X02}", (int)(_color.r * 255), (int)(_color.g * 255), (int)(_color.b * 255)); + public static string ColorToHex (Color _color) { + return string.Format ("{0:X02}{1:X02}{2:X02}", (int) (_color.r * 255), (int) (_color.g * 255), + (int) (_color.b * 255)); } - } } - Index: binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs (revision 325) @@ -1,16 +1,15 @@ using System.Reflection; -using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("7dtd-server-fixes")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Alloc")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +[assembly: AssemblyTitle ("7dtd-server-fixes")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("Alloc")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". @@ -18,5 +17,5 @@ // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyVersion ("0.0.0.0")] // The following attributes are used to specify the signing key for the assembly, @@ -25,3 +24,2 @@ //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] - Index: binary-improvements/7dtd-server-fixes/src/BlockingQueue.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/BlockingQueue.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/BlockingQueue.cs (revision 325) @@ -1,15 +1,11 @@ -using System; using System.Collections.Generic; using System.Threading; -namespace AllocsFixes -{ - public class BlockingQueue - { - private bool closing = false; - private Queue queue = new Queue (); +namespace AllocsFixes { + public class BlockingQueue { + private readonly Queue queue = new Queue (); + private bool closing; - public void Enqueue (T item) - { + public void Enqueue (T item) { lock (queue) { queue.Enqueue (item); @@ -18,19 +14,19 @@ } - public T Dequeue () - { + public T Dequeue () { lock (queue) { while (queue.Count == 0) { if (closing) { - return default(T); + return default (T); } + Monitor.Wait (queue); } + return queue.Dequeue (); } } - public void Close () - { + public void Close () { lock (queue) { closing = true; @@ -38,6 +34,4 @@ } } - } } - Index: binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs (revision 325) @@ -1,8 +1,6 @@ -using System; - -namespace AllocsFixes -{ +namespace AllocsFixes { public class ChatHookExample { - private const string ANSWER = " [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]"; + private const string ANSWER = + " [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]"; public static bool Hook (ClientInfo _cInfo, EChatType _type, string _message, string _playerName) { @@ -11,8 +9,9 @@ if (_cInfo != null) { Log.Out ("Sent chat hook reply to {0}", _cInfo.playerId); - _cInfo.SendPackage (new NetPackageChat(EChatType.Whisper, -1, ANSWER, "", false, null)); + _cInfo.SendPackage (new NetPackageChat (EChatType.Whisper, -1, ANSWER, "", false, null)); } else { Log.Error ("ChatHookExample: Argument _cInfo null on message: {0}", _message); } + return false; } @@ -21,5 +20,4 @@ return true; } - } } Index: binary-improvements/7dtd-server-fixes/src/FileCache/AbstractCache.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/AbstractCache.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/FileCache/AbstractCache.cs (revision 325) @@ -1,8 +1,5 @@ namespace AllocsFixes.FileCache { - public abstract class AbstractCache { - public AbstractCache () { - } - - public abstract byte[] GetFileContent (string filename); - } + public abstract class AbstractCache { + public abstract byte[] GetFileContent (string filename); + } } Index: binary-improvements/7dtd-server-fixes/src/FileCache/DirectAccess.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/DirectAccess.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/FileCache/DirectAccess.cs (revision 325) @@ -1,18 +1,9 @@ using System; -using System.Collections.Generic; using System.IO; -namespace AllocsFixes.FileCache -{ +namespace AllocsFixes.FileCache { // Not caching at all, simply reading from disk on each request - public class DirectAccess : AbstractCache - { - - public DirectAccess () - { - } - - public override byte[] GetFileContent (string filename) - { + public class DirectAccess : AbstractCache { + public override byte[] GetFileContent (string filename) { try { if (!File.Exists (filename)) { @@ -24,8 +15,7 @@ Log.Out ("Error in DirectAccess.GetFileContent: " + e); } + return null; } - } } - Index: binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/FileCache/MapTileCache.cs (revision 325) @@ -2,23 +2,14 @@ using System.IO; using UnityEngine; +using Object = UnityEngine.Object; -namespace AllocsFixes.FileCache -{ +namespace AllocsFixes.FileCache { // Special "cache" for map tile folder as both map rendering and webserver access files in there. // Only map rendering tiles are cached. Writing is done by WriteThrough. - public class MapTileCache : AbstractCache - { - private struct CurrentZoomFile - { - public string filename; - public byte[] data; - } - + public class MapTileCache : AbstractCache { + private readonly byte[] transparentTile; private CurrentZoomFile[] cache; - private byte[] transparentTile; - - public MapTileCache (int _tileSize) - { + public MapTileCache (int _tileSize) { Texture2D tex = new Texture2D (_tileSize, _tileSize); Color nullColor = new Color (0, 0, 0, 0); @@ -28,15 +19,14 @@ } } + transparentTile = tex.EncodeToPNG (); - UnityEngine.Object.Destroy (tex); + Object.Destroy (tex); } - public void SetZoomCount (int count) - { + public void SetZoomCount (int count) { cache = new CurrentZoomFile[count]; } - public byte[] LoadTile (int zoomlevel, string filename) - { + public byte[] LoadTile (int zoomlevel, string filename) { try { lock (cache) { @@ -51,4 +41,5 @@ cache [zoomlevel].data = File.ReadAllBytes (filename); } + return cache [zoomlevel].data; } @@ -56,9 +47,9 @@ Log.Out ("Error in MapTileCache.LoadTile: " + e); } + return null; } - public void SaveTile (int zoomlevel, byte[] content) - { + public void SaveTile (int zoomlevel, byte[] content) { try { lock (cache) { @@ -73,11 +64,11 @@ } - public override byte[] GetFileContent (string filename) - { + public override byte[] GetFileContent (string filename) { try { lock (cache) { foreach (CurrentZoomFile czf in cache) { - if (czf.filename != null && czf.filename.Equals (filename)) + if (czf.filename != null && czf.filename.Equals (filename)) { return czf.data; + } } @@ -85,4 +76,5 @@ return transparentTile; } + return File.ReadAllBytes (filename); } @@ -90,8 +82,12 @@ Log.Out ("Error in MapTileCache.GetFileContent: " + e); } + return null; } + private struct CurrentZoomFile { + public string filename; + public byte[] data; + } } } - Index: binary-improvements/7dtd-server-fixes/src/FileCache/SimpleCache.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/FileCache/SimpleCache.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/FileCache/SimpleCache.cs (revision 325) @@ -3,18 +3,10 @@ using System.IO; -namespace AllocsFixes.FileCache -{ +namespace AllocsFixes.FileCache { // Caching all files, useful for completely static folders only - public class SimpleCache : AbstractCache - { + public class SimpleCache : AbstractCache { + private readonly Dictionary fileCache = new Dictionary (); - private Dictionary fileCache = new Dictionary (); - - public SimpleCache () - { - } - - public override byte[] GetFileContent (string filename) - { + public override byte[] GetFileContent (string filename) { try { lock (fileCache) { @@ -32,8 +24,7 @@ Log.Out ("Error in SimpleCache.GetFileContent: " + e); } + return null; } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs (revision 325) @@ -1,11 +1,8 @@ -using System; using System.Collections.Generic; using System.Text; -namespace AllocsFixes.JSON -{ - public class JSONArray : JSONNode - { - private List nodes = new List (); +namespace AllocsFixes.JSON { + public class JSONArray : JSONNode { + private readonly List nodes = new List (); public JSONNode this [int index] { @@ -18,31 +15,38 @@ } - public void Add (JSONNode node) - { + public void Add (JSONNode node) { nodes.Add (node); } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) - { + public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { stringBuilder.Append ("["); - if (prettyPrint) + if (prettyPrint) { stringBuilder.Append ('\n'); + } + foreach (JSONNode n in nodes) { - if (prettyPrint) - stringBuilder.Append (new String ('\t', currentLevel + 1)); + if (prettyPrint) { + stringBuilder.Append (new string ('\t', currentLevel + 1)); + } + n.ToString (stringBuilder, prettyPrint, currentLevel + 1); stringBuilder.Append (","); - if (prettyPrint) + if (prettyPrint) { stringBuilder.Append ('\n'); + } } - if (nodes.Count > 0) + + if (nodes.Count > 0) { stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1); - if (prettyPrint) - stringBuilder.Append (new String ('\t', currentLevel)); + } + + if (prettyPrint) { + stringBuilder.Append (new string ('\t', currentLevel)); + } + stringBuilder.Append ("]"); } - public static JSONArray Parse (string json, ref int offset) - { + public static JSONArray Parse (string json, ref int offset) { //Log.Out ("ParseArray enter (" + offset + ")"); JSONArray arr = new JSONArray (); @@ -58,9 +62,13 @@ nextElemAllowed = true; offset++; - } else - throw new MalformedJSONException ("Could not parse array, found a comma without a value first"); + } else { + throw new MalformedJSONException ( + "Could not parse array, found a comma without a value first"); + } + break; case ']': offset++; + //Log.Out ("JSON:Parsed Array: " + arr.ToString ()); return arr; @@ -72,6 +80,4 @@ } } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs (revision 325) @@ -1,28 +1,21 @@ -using System; using System.Text; -namespace AllocsFixes.JSON -{ - public class JSONBoolean : JSONValue - { - private bool value; +namespace AllocsFixes.JSON { + public class JSONBoolean : JSONValue { + private readonly bool value; - public JSONBoolean (bool value) - { + public JSONBoolean (bool value) { this.value = value; } - public bool GetBool () - { + public bool GetBool () { return value; } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) - { + public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { stringBuilder.Append (value ? "true" : "false"); } - public static JSONBoolean Parse (string json, ref int offset) - { + public static JSONBoolean Parse (string json, ref int offset) { //Log.Out ("ParseBool enter (" + offset + ")"); @@ -31,14 +24,14 @@ offset += 4; return new JSONBoolean (true); - } else if (json.Substring (offset, 5).Equals ("false")) { + } + + if (json.Substring (offset, 5).Equals ("false")) { //Log.Out ("JSON:Parsed Bool: false"); offset += 5; return new JSONBoolean (false); - } else { - throw new MalformedJSONException ("No valid boolean found"); } + + throw new MalformedJSONException ("No valid boolean found"); } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs (revision 325) @@ -1,10 +1,7 @@ -using System; using System.Text; -namespace AllocsFixes.JSON -{ - public abstract class JSONNode - { - public abstract void ToString(StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0); +namespace AllocsFixes.JSON { + public abstract class JSONNode { + public abstract void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0); public override string ToString () { Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs (revision 325) @@ -1,20 +1,11 @@ -using System; using System.Text; -namespace AllocsFixes.JSON -{ - public class JSONNull : JSONValue - { - public JSONNull () - { - } - - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) - { +namespace AllocsFixes.JSON { + public class JSONNull : JSONValue { + public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { stringBuilder.Append ("null"); } - public static JSONNull Parse (string json, ref int offset) - { + public static JSONNull Parse (string json, ref int offset) { //Log.Out ("ParseNull enter (" + offset + ")"); @@ -23,10 +14,8 @@ offset += 4; return new JSONNull (); - } else { - throw new MalformedJSONException ("No valid null value found"); } + + throw new MalformedJSONException ("No valid null value found"); } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs (revision 325) @@ -2,32 +2,25 @@ using System.Text; -namespace AllocsFixes.JSON -{ - public class JSONNumber : JSONValue - { - private double value; +namespace AllocsFixes.JSON { + public class JSONNumber : JSONValue { + private readonly double value; - public JSONNumber (double value) - { + public JSONNumber (double value) { this.value = value; } - public double GetDouble () - { + public double GetDouble () { return value; } - public int GetInt () - { - return (int)Math.Round(value); + public int GetInt () { + return (int) Math.Round (value); } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) - { + public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { stringBuilder.Append (value.ToCultureInvariantString ()); } - public static JSONNumber Parse (string json, ref int offset) - { + public static JSONNumber Parse (string json, ref int offset) { //Log.Out ("ParseNumber enter (" + offset + ")"); StringBuilder sbNum = new StringBuilder (); @@ -37,48 +30,56 @@ while (offset < json.Length) { if (json [offset] >= '0' && json [offset] <= '9') { - if (hasExp) + if (hasExp) { sbExp.Append (json [offset]); - else + } else { sbNum.Append (json [offset]); + } } else if (json [offset] == '.') { if (hasExp) { throw new MalformedJSONException ("Decimal separator in exponent"); + } + + if (hasDec) { + throw new MalformedJSONException ("Multiple decimal separators in number found"); + } + + if (sbNum.Length == 0) { + throw new MalformedJSONException ("No leading digits before decimal separator found"); + } + + sbNum.Append ('.'); + hasDec = true; + } else if (json [offset] == '-') { + if (hasExp) { + if (sbExp.Length > 0) { + throw new MalformedJSONException ("Negative sign in exponent after digits"); + } + + sbExp.Append (json [offset]); } else { - if (hasDec) - throw new MalformedJSONException ("Multiple decimal separators in number found"); - else if (sbNum.Length == 0) { - throw new MalformedJSONException ("No leading digits before decimal separator found"); - } else { - sbNum.Append ('.'); - hasDec = true; + if (sbNum.Length > 0) { + throw new MalformedJSONException ("Negative sign in mantissa after digits"); } - } - } else if (json [offset] == '-') { - if (hasExp) { - if (sbExp.Length > 0) - throw new MalformedJSONException ("Negative sign in exponent after digits"); - else - sbExp.Append (json [offset]); - } else { - if (sbNum.Length > 0) - throw new MalformedJSONException ("Negative sign in mantissa after digits"); - else - sbNum.Append (json [offset]); + + sbNum.Append (json [offset]); } } else if (json [offset] == 'e' || json [offset] == 'E') { - if (hasExp) + if (hasExp) { throw new MalformedJSONException ("Multiple exponential markers in number found"); - else if (sbNum.Length == 0) { + } + + if (sbNum.Length == 0) { throw new MalformedJSONException ("No leading digits before exponential marker found"); - } else { - sbExp = new StringBuilder (); - hasExp = true; } + + sbExp = new StringBuilder (); + hasExp = true; } else if (json [offset] == '+') { if (hasExp) { - if (sbExp.Length > 0) + if (sbExp.Length > 0) { throw new MalformedJSONException ("Positive sign in exponent after digits"); - else - sbExp.Append (json [offset]); + } + + sbExp.Append (json [offset]); } else { throw new MalformedJSONException ("Positive sign in mantissa found"); @@ -86,6 +87,6 @@ } else { double number; - if (!StringParsers.TryParseDouble(sbNum.ToString (), out number)) { - throw new MalformedJSONException ("Mantissa is not a valid decimal (\"" + sbNum.ToString () + "\")"); + if (!StringParsers.TryParseDouble (sbNum.ToString (), out number)) { + throw new MalformedJSONException ("Mantissa is not a valid decimal (\"" + sbNum + "\")"); } @@ -93,5 +94,5 @@ int exp; if (!int.TryParse (sbExp.ToString (), out exp)) { - throw new MalformedJSONException ("Exponent is not a valid integer (\"" + sbExp.ToString () + "\")"); + throw new MalformedJSONException ("Exponent is not a valid integer (\"" + sbExp + "\")"); } @@ -102,10 +103,10 @@ return new JSONNumber (number); } + offset++; } + throw new MalformedJSONException ("End of JSON reached before parsing number finished"); } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs (revision 325) @@ -1,11 +1,8 @@ -using System; using System.Collections.Generic; using System.Text; -namespace AllocsFixes.JSON -{ - public class JSONObject : JSONNode - { - private Dictionary nodes = new Dictionary (); +namespace AllocsFixes.JSON { + public class JSONObject : JSONNode { + private readonly Dictionary nodes = new Dictionary (); public JSONNode this [string name] { @@ -22,39 +19,47 @@ } - public bool ContainsKey (string name) - { + public bool ContainsKey (string name) { return nodes.ContainsKey (name); } - public void Add (string name, JSONNode node) - { + public void Add (string name, JSONNode node) { nodes.Add (name, node); } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) - { + public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { stringBuilder.Append ("{"); - if (prettyPrint) + if (prettyPrint) { stringBuilder.Append ('\n'); + } + foreach (KeyValuePair kvp in nodes) { - if (prettyPrint) - stringBuilder.Append (new String ('\t', currentLevel + 1)); - stringBuilder.Append (String.Format ("\"{0}\":", kvp.Key)); - if (prettyPrint) + if (prettyPrint) { + stringBuilder.Append (new string ('\t', currentLevel + 1)); + } + + stringBuilder.Append (string.Format ("\"{0}\":", kvp.Key)); + if (prettyPrint) { stringBuilder.Append (" "); + } + kvp.Value.ToString (stringBuilder, prettyPrint, currentLevel + 1); stringBuilder.Append (","); - if (prettyPrint) + if (prettyPrint) { stringBuilder.Append ('\n'); + } } - if (nodes.Count > 0) + + if (nodes.Count > 0) { stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1); - if (prettyPrint) - stringBuilder.Append (new String ('\t', currentLevel)); + } + + if (prettyPrint) { + stringBuilder.Append (new string ('\t', currentLevel)); + } + stringBuilder.Append ("}"); } - public static JSONObject Parse (string json, ref int offset) - { + public static JSONObject Parse (string json, ref int offset) { //Log.Out ("ParseObject enter (" + offset + ")"); JSONObject obj = new JSONObject (); @@ -70,6 +75,8 @@ Parser.SkipWhitespace (json, ref offset); if (json [offset] != ':') { - throw new MalformedJSONException ("Could not parse object, missing colon (\":\") after key"); + throw new MalformedJSONException ( + "Could not parse object, missing colon (\":\") after key"); } + offset++; JSONNode val = Parser.ParseInternal (json, ref offset); @@ -77,6 +84,8 @@ nextElemAllowed = false; } else { - throw new MalformedJSONException ("Could not parse object, found new key without a separating comma"); + throw new MalformedJSONException ( + "Could not parse object, found new key without a separating comma"); } + break; case ',': @@ -84,9 +93,13 @@ nextElemAllowed = true; offset++; - } else - throw new MalformedJSONException ("Could not parse object, found a comma without a key/value pair first"); + } else { + throw new MalformedJSONException ( + "Could not parse object, found a comma without a key/value pair first"); + } + break; case '}': offset++; + //Log.Out ("JSON:Parsed Object: " + obj.ToString ()); return obj; @@ -94,6 +107,4 @@ } } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs (revision 325) @@ -1,23 +1,17 @@ -using System; using System.Text; -namespace AllocsFixes.JSON -{ - public class JSONString : JSONValue - { - private string value; +namespace AllocsFixes.JSON { + public class JSONString : JSONValue { + private readonly string value; - public JSONString (string value) - { + public JSONString (string value) { this.value = value; } - public string GetString () - { + public string GetString () { return value; } - public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) - { + public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) { if (value == null || value.Length == 0) { stringBuilder.Append ("\"\""); @@ -27,6 +21,5 @@ int len = value.Length; - stringBuilder.EnsureCapacity (stringBuilder.Length + 2*len); - String t; + stringBuilder.EnsureCapacity (stringBuilder.Length + 2 * len); stringBuilder.Append ('"'); @@ -36,4 +29,5 @@ case '\\': case '"': + // case '/': stringBuilder.Append ('\\'); @@ -58,8 +52,9 @@ if (c < ' ') { stringBuilder.Append ("\\u"); - stringBuilder.Append (((int)c).ToString ("X4")); + stringBuilder.Append (((int) c).ToString ("X4")); } else { stringBuilder.Append (c); } + break; } @@ -69,6 +64,5 @@ } - public static JSONString Parse (string json, ref int offset) - { + public static JSONString Parse (string json, ref int offset) { //Log.Out ("ParseString enter (" + offset + ")"); StringBuilder sb = new StringBuilder (); @@ -103,8 +97,10 @@ break; } + offset++; break; case '"': offset++; + //Log.Out ("JSON:Parsed String: " + sb.ToString ()); return new JSONString (sb.ToString ()); @@ -115,8 +111,7 @@ } } + throw new MalformedJSONException ("End of JSON reached before parsing string finished"); } - } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/JSONValue.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/JSONValue.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/JSONValue.cs (revision 325) @@ -1,8 +1,4 @@ -using System; - -namespace AllocsFixes.JSON -{ +namespace AllocsFixes.JSON { public abstract class JSONValue : JSONNode { } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/MalformedJSONException.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/MalformedJSONException.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/MalformedJSONException.cs (revision 325) @@ -2,24 +2,17 @@ using System.Runtime.Serialization; -namespace AllocsFixes.JSON -{ - public class MalformedJSONException : ApplicationException - { - public MalformedJSONException () - { +namespace AllocsFixes.JSON { + public class MalformedJSONException : ApplicationException { + public MalformedJSONException () { } - public MalformedJSONException (string message) : base(message) - { + public MalformedJSONException (string message) : base (message) { } - public MalformedJSONException (string message, System.Exception inner) : base(message, inner) - { + public MalformedJSONException (string message, Exception inner) : base (message, inner) { } - - protected MalformedJSONException (SerializationInfo info, StreamingContext context) : base(info, context) - { + + protected MalformedJSONException (SerializationInfo info, StreamingContext context) : base (info, context) { } } } - Index: binary-improvements/7dtd-server-fixes/src/JSON/Parser.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/JSON/Parser.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/JSON/Parser.cs (revision 325) @@ -1,19 +1,12 @@ -using System; -using System.Text; - -namespace AllocsFixes.JSON -{ - public class Parser - { - - public static JSONNode Parse (string json) - { +namespace AllocsFixes.JSON { + public class Parser { + public static JSONNode Parse (string json) { int offset = 0; return ParseInternal (json, ref offset); } - public static JSONNode ParseInternal (string json, ref int offset) - { + public static JSONNode ParseInternal (string json, ref int offset) { SkipWhitespace (json, ref offset); + //Log.Out ("ParseInternal (" + offset + "): Decide on: '" + json [offset] + "'"); switch (json [offset]) { @@ -34,6 +27,5 @@ } - public static void SkipWhitespace (string json, ref int offset) - { + public static void SkipWhitespace (string json, ref int offset) { //Log.Out ("SkipWhitespace (" + offset + "): '" + json [offset] + "'"); while (offset < json.Length) { @@ -49,9 +41,7 @@ } } + throw new MalformedJSONException ("End of JSON reached before parsing finished"); } - - } } - Index: binary-improvements/7dtd-server-fixes/src/LandClaimList.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/LandClaimList.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/LandClaimList.cs (revision 325) @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; - using AllocsFixes.PersistentData; -namespace AllocsFixes -{ +namespace AllocsFixes { public class LandClaimList { public delegate bool OwnerFilter (Player owner); @@ -11,10 +9,12 @@ public delegate bool PositionFilter (Vector3i position); - public static Dictionary> GetLandClaims (OwnerFilter[] _ownerFilters, PositionFilter[] _positionFilters) { + public static Dictionary> GetLandClaims (OwnerFilter[] _ownerFilters, + PositionFilter[] _positionFilters) { Dictionary d = GameManager.Instance.GetPersistentPlayerList ().m_lpBlockMap; Dictionary> result = new Dictionary> (); if (d != null) { - Dictionary> owners = new Dictionary> (); + Dictionary> owners = + new Dictionary> (); foreach (KeyValuePair kvp in d) { bool allowed = true; @@ -27,8 +27,10 @@ } } + if (allowed) { if (!owners.ContainsKey (kvp.Value)) { owners.Add (kvp.Value, new List ()); } + owners [kvp.Value].Add (kvp.Key); } @@ -36,5 +38,5 @@ foreach (KeyValuePair> kvp in owners) { - Player p = PersistentData.PersistentContainer.Instance.Players [kvp.Key.PlayerId, false]; + Player p = PersistentContainer.Instance.Players [kvp.Key.PlayerId, false]; if (p == null) { p = new Player (kvp.Key.PlayerId); @@ -59,4 +61,5 @@ } } + return result; } @@ -73,6 +76,4 @@ return p => _f1 (p) || _f2 (p); } - } } - Index: binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs (revision 325) @@ -1,15 +1,9 @@ -using System; -using System.Collections.Generic; - -namespace AllocsFixes.LiveData -{ - public class Animals : EntityFilterList - { - +namespace AllocsFixes.LiveData { + public class Animals : EntityFilterList { public static readonly Animals Instance = new Animals (); protected override EntityAnimal predicate (Entity _e) { if (_e is EntityAnimal) { - EntityAnimal ea = (EntityAnimal)_e; + EntityAnimal ea = (EntityAnimal) _e; if (ea.IsAlive ()) { @@ -17,8 +11,7 @@ } } + return null; } - - } + } } - Index: binary-improvements/7dtd-server-fixes/src/LiveData/EntityFilterList.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/LiveData/EntityFilterList.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/LiveData/EntityFilterList.cs (revision 325) @@ -2,8 +2,6 @@ using System.Collections.Generic; -namespace AllocsFixes.LiveData -{ - public abstract class EntityFilterList where T: Entity - { +namespace AllocsFixes.LiveData { + public abstract class EntityFilterList where T : Entity { public void Get (List _list) { _list.Clear (); @@ -18,6 +16,5 @@ } } - } - catch (Exception e) { + } catch (Exception e) { Log.Exception (e); } @@ -35,14 +32,12 @@ } } - } - catch (Exception e) { + } catch (Exception e) { Log.Exception (e); } + return count; } protected abstract T predicate (Entity _e); - - } + } } - Index: binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs (revision 325) @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; - -namespace AllocsFixes.LiveData -{ - public class Hostiles : EntityFilterList - { - +namespace AllocsFixes.LiveData { + public class Hostiles : EntityFilterList { public static readonly Hostiles Instance = new Hostiles (); - override protected EntityEnemy predicate (Entity _e) { + protected override EntityEnemy predicate (Entity _e) { if (_e is EntityEnemy) { if (_e.IsAlive ()) { @@ -15,8 +9,7 @@ } } + return null; } - } } - Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Attributes.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Attributes.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Attributes.cs (revision 325) @@ -1,22 +1,13 @@ using System; -using System.Collections.Generic; -using System.Runtime.Serialization; -using System.Text.RegularExpressions; -namespace AllocsFixes.PersistentData -{ +namespace AllocsFixes.PersistentData { [Serializable] - public class Attributes - { + public class Attributes { private bool hideChatCommands; private String hideChatCommandPrefix; public bool HideChatCommands { - get { - return hideChatCommands; - } - set { - hideChatCommands = value; - } + get { return hideChatCommands; } + set { hideChatCommands = value; } } @@ -26,12 +17,9 @@ hideChatCommandPrefix = ""; } + return hideChatCommandPrefix; } - set { - hideChatCommandPrefix = value; - } + set { hideChatCommandPrefix = value; } } - } } - Index: binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs (revision 325) @@ -2,6 +2,5 @@ using System.Runtime.Serialization; -namespace AllocsFixes.PersistentData -{ +namespace AllocsFixes.PersistentData { [Serializable] public class InvItem { @@ -26,3 +25,2 @@ } } - Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs (revision 325) @@ -3,85 +3,85 @@ namespace AllocsFixes.PersistentData { - [Serializable] - public class Inventory { - public List bag; - public List belt; - public InvItem[] equipment; + [Serializable] + public class Inventory { + public List bag; + public List belt; + public InvItem[] equipment; - public Inventory () { - bag = new List (); - belt = new List (); - equipment = null; - } + public Inventory () { + bag = new List (); + belt = new List (); + equipment = null; + } - public void Update (PlayerDataFile pdf) { - lock (this) { - //Log.Out ("Updating player inventory - player id: " + pdf.id); - ProcessInv (bag, pdf.bag, pdf.id); - ProcessInv (belt, pdf.inventory, pdf.id); - ProcessEqu (pdf.equipment, pdf.id); - } - } + public void Update (PlayerDataFile pdf) { + lock (this) { + //Log.Out ("Updating player inventory - player id: " + pdf.id); + ProcessInv (bag, pdf.bag, pdf.id); + ProcessInv (belt, pdf.inventory, pdf.id); + ProcessEqu (pdf.equipment, pdf.id); + } + } - private void ProcessInv (List target, ItemStack[] sourceFields, int id) { - target.Clear (); - for (int i = 0; i < sourceFields.Length; i++) { - InvItem item = CreateInvItem (sourceFields [i].itemValue, sourceFields [i].count, id); - if (item != null && sourceFields [i].itemValue.Modifications != null) { - ProcessParts (sourceFields [i].itemValue.Modifications, item, id); - } + private void ProcessInv (List target, ItemStack[] sourceFields, int id) { + target.Clear (); + for (int i = 0; i < sourceFields.Length; i++) { + InvItem item = CreateInvItem (sourceFields [i].itemValue, sourceFields [i].count, id); + if (item != null && sourceFields [i].itemValue.Modifications != null) { + ProcessParts (sourceFields [i].itemValue.Modifications, item, id); + } - target.Add (item); - } - } + target.Add (item); + } + } - private void ProcessEqu (Equipment sourceEquipment, int _playerId) { - equipment = new InvItem[sourceEquipment.GetSlotCount ()]; - for (int i = 0; i < sourceEquipment.GetSlotCount (); i++) { - equipment [i] = CreateInvItem (sourceEquipment.GetSlotItem (i), 1, _playerId); - } - } + private void ProcessEqu (Equipment sourceEquipment, int _playerId) { + equipment = new InvItem[sourceEquipment.GetSlotCount ()]; + for (int i = 0; i < sourceEquipment.GetSlotCount (); i++) { + equipment [i] = CreateInvItem (sourceEquipment.GetSlotItem (i), 1, _playerId); + } + } - private void ProcessParts (ItemValue[] _parts, InvItem _item, int _playerId) { - InvItem[] itemParts = new InvItem[_parts.Length]; - for (int i = 0; i < _parts.Length; i++) { - InvItem partItem = CreateInvItem (_parts [i], 1, _playerId); - if (partItem != null && _parts [i].Modifications != null) { - ProcessParts (_parts [i].Modifications, partItem, _playerId); - } + private void ProcessParts (ItemValue[] _parts, InvItem _item, int _playerId) { + InvItem[] itemParts = new InvItem[_parts.Length]; + for (int i = 0; i < _parts.Length; i++) { + InvItem partItem = CreateInvItem (_parts [i], 1, _playerId); + if (partItem != null && _parts [i].Modifications != null) { + ProcessParts (_parts [i].Modifications, partItem, _playerId); + } - itemParts [i] = partItem; - } + itemParts [i] = partItem; + } - _item.parts = itemParts; - } + _item.parts = itemParts; + } - private InvItem CreateInvItem (ItemValue _itemValue, int _count, int _playerId) { - if (_count > 0 && _itemValue != null && !_itemValue.Equals (ItemValue.None)) { - ItemClass itemClass = ItemClass.list [_itemValue.type]; - int maxAllowed = itemClass.Stacknumber.Value; - string name = itemClass.GetItemName (); + private InvItem CreateInvItem (ItemValue _itemValue, int _count, int _playerId) { + if (_count > 0 && _itemValue != null && !_itemValue.Equals (ItemValue.None)) { + ItemClass itemClass = ItemClass.list [_itemValue.type]; + int maxAllowed = itemClass.Stacknumber.Value; + string name = itemClass.GetItemName (); - if (_count > maxAllowed) { - Log.Out ("Player with ID " + _playerId + " has stack for \"" + name + "\" greater than allowed (" + - _count + " > " + maxAllowed + ")"); - } + if (_count > maxAllowed) { + Log.Out ("Player with ID " + _playerId + " has stack for \"" + name + "\" greater than allowed (" + + _count + " > " + maxAllowed + ")"); + } - InvItem item = null; - if (_itemValue.HasQuality) { - item = new InvItem (name, _count, _itemValue.Quality, _itemValue.MaxUseTimes, _itemValue.UseTimes); - } else { - item = new InvItem (name, _count, -1, _itemValue.MaxUseTimes, _itemValue.UseTimes); - } + InvItem item = null; + if (_itemValue.HasQuality) { + item = new InvItem (name, _count, _itemValue.Quality, _itemValue.MaxUseTimes, _itemValue.UseTimes); + } else { + item = new InvItem (name, _count, -1, _itemValue.MaxUseTimes, _itemValue.UseTimes); + } - item.icon = itemClass.GetIconName (); + item.icon = itemClass.GetIconName (); - item.iconcolor = AllocsUtils.ColorToHex (itemClass.GetIconTint ()); + item.iconcolor = AllocsUtils.ColorToHex (itemClass.GetIconTint ()); - return item; - } else { - return null; - } - } - } + return item; + } + + return null; + } + } } Index: binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs (revision 325) @@ -4,27 +4,26 @@ using System.Runtime.Serialization.Formatters.Binary; -namespace AllocsFixes.PersistentData -{ +namespace AllocsFixes.PersistentData { [Serializable] - public class PersistentContainer - { + public class PersistentContainer { private Players players; - [OptionalField] - private Attributes attributes; + [OptionalField] private Attributes attributes; public Players Players { get { - if (players == null) + if (players == null) { players = new Players (); + } + return players; } } - public Attributes Attributes - { + public Attributes Attributes { get { if (attributes == null) { - attributes = new Attributes(); + attributes = new Attributes (); } + return attributes; } @@ -38,14 +37,13 @@ instance = new PersistentContainer (); } + return instance; } } - private PersistentContainer () - { + private PersistentContainer () { } - public void Save () - { + public void Save () { Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create); BinaryFormatter bFormatter = new BinaryFormatter (); @@ -54,6 +52,5 @@ } - public static bool Load () - { + public static bool Load () { if (File.Exists (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin")) { try { @@ -61,5 +58,5 @@ Stream stream = File.Open (GameUtils.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open); BinaryFormatter bFormatter = new BinaryFormatter (); - obj = (PersistentContainer)bFormatter.Deserialize (stream); + obj = (PersistentContainer) bFormatter.Deserialize (stream); stream.Close (); instance = obj; @@ -70,8 +67,7 @@ } } + return false; } - } } - Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs (revision 325) @@ -4,36 +4,33 @@ namespace AllocsFixes.PersistentData { - [Serializable] - public class Player { - private readonly string steamId; - private int entityId; - private string name; - private string ip; - private long totalPlayTime; - - [OptionalField] private DateTime - lastOnline; - - private Inventory inventory; - - [OptionalField] private int - lastPositionX, lastPositionY, lastPositionZ; - - [OptionalField] [Obsolete ("experience no longer available, use level and expToNextLevel instead")] - private uint experience; - - [OptionalField] private bool chatMuted; - [OptionalField] private int maxChatLength; - [OptionalField] private string chatColor; - [OptionalField] private bool chatName; - [OptionalField] private uint expToNextLevel; - [OptionalField] private int level; - - [NonSerialized] private ClientInfo - clientInfo; - - public string SteamID { - get { return steamId; } - } + [Serializable] + public class Player { + private readonly string steamId; + private int entityId; + private string name; + private string ip; + private long totalPlayTime; + + [OptionalField] private DateTime lastOnline; + + private Inventory inventory; + + [OptionalField] private int lastPositionX, lastPositionY, lastPositionZ; + + [OptionalField] [Obsolete ("experience no longer available, use level and expToNextLevel instead")] + private uint experience; + + [OptionalField] private bool chatMuted; + [OptionalField] private int maxChatLength; + [OptionalField] private string chatColor; + [OptionalField] private bool chatName; + [OptionalField] private uint expToNextLevel; + [OptionalField] private int level; + + [NonSerialized] private ClientInfo clientInfo; + + public string SteamID { + get { return steamId; } + } public int EntityID { @@ -41,177 +38,181 @@ } - public string Name { - get { return name == null ? string.Empty : name; } - } - - public string IP { - get { return ip == null ? string.Empty : ip; } - } - - public Inventory Inventory { - get { - if (inventory == null) - inventory = new Inventory (); - return inventory; - } - } - - public bool IsOnline { - get { return clientInfo != null; } - } - - public ClientInfo ClientInfo { - get { return clientInfo; } - } - - public EntityPlayer Entity { - get { - if (IsOnline) { - return GameManager.Instance.World.Players.dict [clientInfo.entityId]; - } else { - return null; - } - } - } - - public long TotalPlayTime { - get { - if (IsOnline) { - return totalPlayTime + (long) (DateTime.Now - lastOnline).TotalSeconds; - } else { - return totalPlayTime; - } - } - } - - public DateTime LastOnline { - get { - if (IsOnline) - return DateTime.Now; - else - return lastOnline; - } - } - - public Vector3i LastPosition { - get { - if (IsOnline) - return new Vector3i (Entity.GetPosition ()); - else - return new Vector3i (lastPositionX, lastPositionY, lastPositionZ); - } - } - - public bool LandProtectionActive { - get { - return GameManager.Instance.World.IsLandProtectionValidForPlayer (GameManager.Instance - .GetPersistentPlayerList ().GetPlayerData (SteamID)); - } - } - - public float LandProtectionMultiplier { - get { - return GameManager.Instance.World.GetLandProtectionHardnessModifierForPlayer (GameManager.Instance - .GetPersistentPlayerList ().GetPlayerData (SteamID)); - } - } - - - [Obsolete ("Experience no longer available, use Level instead")] - public uint Experience { - get { return 0; } - } - - public float Level { - get { - float expForNextLevel = - (int) Math.Min ((Progression.BaseExpToLevel * Mathf.Pow (Progression.ExpMultiplier, level + 1)), - int.MaxValue); - float fLevel = level + 1f - ((float) expToNextLevel / expForNextLevel); - return fLevel; - } - } - - public bool IsChatMuted { - get { return chatMuted; } - set { chatMuted = value; } - } - - public int MaxChatLength { - get { - if (maxChatLength == 0) { - maxChatLength = 255; - } - - return maxChatLength; - } - set { maxChatLength = value; } - } - - public string ChatColor { - get { - if (chatColor == null || chatColor == "") { - chatColor = ""; - } - - return chatColor; - } - - set { chatColor = value; } - } - - public bool ChatName { - get { return chatName; } - - set { chatName = value; } - } - - public void SetOffline () { - if (clientInfo != null) { - Log.Out ("Player set to offline: " + steamId); - lastOnline = DateTime.Now; - try { - Vector3i lastPos = new Vector3i (Entity.GetPosition ()); - lastPositionX = lastPos.x; - lastPositionY = lastPos.y; - lastPositionZ = lastPos.z; - totalPlayTime += (long) (Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad); - } catch (NullReferenceException) { - Log.Out ("Entity not available. Something seems to be wrong here..."); - } - - clientInfo = null; - } - } - - public void SetOnline (ClientInfo ci) { - Log.Out ("Player set to online: " + steamId); - clientInfo = ci; + public string Name { + get { return name == null ? string.Empty : name; } + } + + public string IP { + get { return ip == null ? string.Empty : ip; } + } + + public Inventory Inventory { + get { + if (inventory == null) { + inventory = new Inventory (); + } + + return inventory; + } + } + + public bool IsOnline { + get { return clientInfo != null; } + } + + public ClientInfo ClientInfo { + get { return clientInfo; } + } + + public EntityPlayer Entity { + get { + if (IsOnline) { + return GameManager.Instance.World.Players.dict [clientInfo.entityId]; + } + + return null; + } + } + + public long TotalPlayTime { + get { + if (IsOnline) { + return totalPlayTime + (long) (DateTime.Now - lastOnline).TotalSeconds; + } + + return totalPlayTime; + } + } + + public DateTime LastOnline { + get { + if (IsOnline) { + return DateTime.Now; + } + + return lastOnline; + } + } + + public Vector3i LastPosition { + get { + if (IsOnline) { + return new Vector3i (Entity.GetPosition ()); + } + + return new Vector3i (lastPositionX, lastPositionY, lastPositionZ); + } + } + + public bool LandProtectionActive { + get { + return GameManager.Instance.World.IsLandProtectionValidForPlayer (GameManager.Instance + .GetPersistentPlayerList ().GetPlayerData (SteamID)); + } + } + + public float LandProtectionMultiplier { + get { + return GameManager.Instance.World.GetLandProtectionHardnessModifierForPlayer (GameManager.Instance + .GetPersistentPlayerList ().GetPlayerData (SteamID)); + } + } + + + [Obsolete ("Experience no longer available, use Level instead")] + public uint Experience { + get { return 0; } + } + + public float Level { + get { + float expForNextLevel = + (int) Math.Min (Progression.BaseExpToLevel * Mathf.Pow (Progression.ExpMultiplier, level + 1), + int.MaxValue); + float fLevel = level + 1f - expToNextLevel / expForNextLevel; + return fLevel; + } + } + + public bool IsChatMuted { + get { return chatMuted; } + set { chatMuted = value; } + } + + public int MaxChatLength { + get { + if (maxChatLength == 0) { + maxChatLength = 255; + } + + return maxChatLength; + } + set { maxChatLength = value; } + } + + public string ChatColor { + get { + if (chatColor == null || chatColor == "") { + chatColor = ""; + } + + return chatColor; + } + + set { chatColor = value; } + } + + public bool ChatName { + get { return chatName; } + + set { chatName = value; } + } + + public Player (string steamId) { + this.steamId = steamId; + inventory = new Inventory (); + } + + public void SetOffline () { + if (clientInfo != null) { + Log.Out ("Player set to offline: " + steamId); + lastOnline = DateTime.Now; + try { + Vector3i lastPos = new Vector3i (Entity.GetPosition ()); + lastPositionX = lastPos.x; + lastPositionY = lastPos.y; + lastPositionZ = lastPos.z; + totalPlayTime += (long) (Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad); + } catch (NullReferenceException) { + Log.Out ("Entity not available. Something seems to be wrong here..."); + } + + clientInfo = null; + } + } + + public void SetOnline (ClientInfo ci) { + Log.Out ("Player set to online: " + steamId); + clientInfo = ci; entityId = ci.entityId; - name = ci.playerName; - ip = ci.ip; - lastOnline = DateTime.Now; - } - - public void Update (PlayerDataFile _pdf) { - UpdateProgression (_pdf); - inventory.Update (_pdf); - } - - private void UpdateProgression (PlayerDataFile _pdf) { - if (_pdf.progressionData.Length > 0) { - using (PooledBinaryReader pbr = MemoryPools.poolBinaryReader.AllocSync (false)) { - pbr.SetBaseStream (_pdf.progressionData); - Progression p = Progression.Read (pbr, null); - expToNextLevel = (uint) p.ExpToNextLevel; - level = p.Level; - } - } - } - - public Player (string steamId) { - this.steamId = steamId; - this.inventory = new Inventory (); - } - } + name = ci.playerName; + ip = ci.ip; + lastOnline = DateTime.Now; + } + + public void Update (PlayerDataFile _pdf) { + UpdateProgression (_pdf); + inventory.Update (_pdf); + } + + private void UpdateProgression (PlayerDataFile _pdf) { + if (_pdf.progressionData.Length > 0) { + using (PooledBinaryReader pbr = MemoryPools.poolBinaryReader.AllocSync (false)) { + pbr.SetBaseStream (_pdf.progressionData); + Progression p = Progression.Read (pbr, null); + expToNextLevel = (uint) p.ExpToNextLevel; + level = p.Level; + } + } + } + } } Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs (revision 325) @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; -using System.Runtime.Serialization; using System.Text.RegularExpressions; -namespace AllocsFixes.PersistentData -{ +namespace AllocsFixes.PersistentData { [Serializable] public class Players { - private Dictionary players = new Dictionary (); + private readonly Dictionary players = new Dictionary (); public Player this [string steamId, bool create] { @@ -14,15 +12,18 @@ if (string.IsNullOrEmpty (steamId)) { return null; - } else if (players.ContainsKey (steamId)) { + } + + if (players.ContainsKey (steamId)) { return players [steamId]; - } else { - if (create && steamId != null && steamId.Length == 17) { - Log.Out ("Created new player entry for ID: " + steamId); - Player p = new Player (steamId); - players.Add (steamId, p); - return p; - } - return null; } + + if (create && steamId != null && steamId.Length == 17) { + Log.Out ("Created new player entry for ID: " + steamId); + Player p = new Player (steamId); + players.Add (steamId, p); + return p; + } + + return null; } } @@ -53,28 +54,29 @@ if (_nameOrId.Length == 17 && long.TryParse (_nameOrId, out tempLong)) { return _nameOrId; - } else { - int entityId = -1; - if (int.TryParse (_nameOrId, out entityId)) { - foreach (KeyValuePair kvp in players) { - if (kvp.Value.IsOnline && kvp.Value.EntityID == entityId) { - return kvp.Key; - } - } - } + } - _nameOrId = _nameOrId.ToLower (); + int entityId = -1; + if (int.TryParse (_nameOrId, out entityId)) { foreach (KeyValuePair kvp in players) { - string name = kvp.Value.Name.ToLower (); - if (_ignoreColorCodes) { - name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", ""); - } - if (kvp.Value.IsOnline && name.Equals (_nameOrId)) { + if (kvp.Value.IsOnline && kvp.Value.EntityID == entityId) { return kvp.Key; } } } + + _nameOrId = _nameOrId.ToLower (); + foreach (KeyValuePair kvp in players) { + string name = kvp.Value.Name.ToLower (); + if (_ignoreColorCodes) { + name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", ""); + } + + if (kvp.Value.IsOnline && name.Equals (_nameOrId)) { + return kvp.Key; + } + } + return null; } } } - Index: binary-improvements/7dtd-server-fixes/src/PlayerDataStuff.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/PlayerDataStuff.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/PlayerDataStuff.cs (revision 325) @@ -1,21 +1,14 @@ +using System; using AllocsFixes.PersistentData; -using System; -using System.Collections.Generic; -namespace AllocsFixes -{ - public class PlayerDataStuff - { - - public static void GM_SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) - { +namespace AllocsFixes { + public class PlayerDataStuff { + public static void GM_SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) { try { - PersistentContainer.Instance.Players[_cInfo.playerId, true].Update (_playerDataFile); + PersistentContainer.Instance.Players [_cInfo.playerId, true].Update (_playerDataFile); } catch (Exception e) { Log.Out ("Error in GM_SavePlayerData: " + e); } } - - } } Index: binary-improvements/7dtd-server-fixes/src/StateManager.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/StateManager.cs (revision 324) +++ binary-improvements/7dtd-server-fixes/src/StateManager.cs (revision 325) @@ -1,13 +1,10 @@ using System; -using System.Reflection; +using AllocsFixes.PersistentData; -namespace AllocsFixes -{ - public class StateManager - { - public static void Awake () - { +namespace AllocsFixes { + public class StateManager { + public static void Awake () { try { - PersistentData.PersistentContainer.Load (); + PersistentContainer.Load (); } catch (Exception e) { Log.Out ("Error in StateManager.Awake: " + e); @@ -15,9 +12,8 @@ } - public static void Shutdown () - { + public static void Shutdown () { try { Log.Out ("Server shutting down!"); - PersistentData.PersistentContainer.Instance.Save (); + PersistentContainer.Instance.Save (); } catch (Exception e) { Log.Out ("Error in StateManager.Shutdown: " + e); @@ -26,3 +22,2 @@ } } -