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

Timestamp:

Aug 2, 2017, 6:46:15 PM (7 years ago)

Author:

alloc

Message:

Fixes update A16.2

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (1 diff)
• ModInfo.xml (modified) (1 diff)
• src/ItemList.cs (deleted)
• src/JSON/JSONString.cs (modified) (1 diff)
• src/LiveData/Animals.cs (modified) (1 diff)
• src/LiveData/Hostiles.cs (modified) (1 diff)
• src/StateManager.cs (modified) (1 diff)

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

@@ -83 +83 @@
     <Compile Include="src\JSON\JSONNull.cs" />
     <Compile Include="src\JSON\MalformedJSONException.cs" />
-    <Compile Include="src\ItemList.cs" />
     <Compile Include="src\FileCache\AbstractCache.cs" />
     <Compile Include="src\FileCache\DirectAccess.cs" />

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="14" />
+                <Version value="15" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs

@@ -33 +33 @@
                                         case '\\':
                                         case '"':
-                                        case '/':
+//                                      case '/':
                                                 sb.Append ('\\');
                                                 sb.Append (c);

binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs

@@ -6 +6 @@
     public class Animals
     {
-        public static List<EntityAnimal> List {
-            get {
-                List<EntityAnimal> lst = new List<EntityAnimal> ();
+                public static void Get (List<EntityAnimal> _list) {
+                        _list.Clear ();
+                        try {
+                                List<Entity> entities = GameManager.Instance.World.Entities.list;
+                                for (int i = 0; i < entities.Count; i++) {
+                                        Entity entity = entities [i];
 
-                try {
-                    foreach (object base_entity in GameManager.Instance.World.Entities.list) {
-                        try {
-                            Entity entity = (Entity)base_entity;
+                                        // Kind of hack-ish, but the game is legitimately setting the base type of animals ('entityType') to enum 0 ('EntityType.Unknown').
+                                        if ((entity.entityType == EntityType.Animal) || (entity is EntityAnimal)) {
+                                                EntityAnimal ea = (EntityAnimal)entity;
 
-                            // Kind of hack-ish, but the game is legitimately setting the base type of animals ('entityType') to enum 0 ('EntityType.Unknown').
-                            if ((entity.entityType == EntityType.Animal) || (base_entity.GetType ().ToString ().ToLower ().Contains ("animal"))) {
-                                EntityAnimal ea = (EntityAnimal)entity;
+                                                if (ea.IsAlive ())
+                                                        _list.Add (ea);
+                                        }
+                                }
+                        }
+                        catch (Exception e) {
+                                Log.Exception (e);
+                        }
+                }
 
-                                if (ea.IsAlive ())
-                                    lst.Add (ea);
-                            }
-                        }
-                        catch { }
-                    }
-                }
-                catch { }
+                public static int GetCount () {
+                        int count = 0;
+                        try {
+                                List<Entity> entities = GameManager.Instance.World.Entities.list;
+                                for (int i = 0; i < entities.Count; i++) {
+                                        Entity entity = entities [i];
 
-                return lst;
-            }
-        }
+                                        // Kind of hack-ish, but the game is legitimately setting the base type of animals ('entityType') to enum 0 ('EntityType.Unknown').
+                                        if ((entity.entityType == EntityType.Animal) || (entity is EntityAnimal)) {
+                                                EntityAnimal ea = (EntityAnimal)entity;
 
+                                                if (ea.IsAlive ())
+                                                        count++;
+                                        }
+                                }
+                        }
+                        catch (Exception e) {
+                                Log.Exception (e);
+                        }
+                        return count;
+                }
 
-        public static int Count {
-            get { return List.Count; }
-        }
     }
 }

binary-improvements/7dtd-server-fixes/src/LiveData/Hostiles.cs

@@ -4 +4 @@
 namespace AllocsFixes.LiveData
 {
-    public class Hostiles
-    {
-        public static List<EntityEnemy> List {
-            get {
-                List<EntityEnemy> lst = new List<EntityEnemy> ();
+        public class Hostiles
+        {
+                public static void Get (List<EntityEnemy> _list) {
+                        _list.Clear ();
+                        try {
+                                List<Entity> entities = GameManager.Instance.World.Entities.list;
+                                for (int i = 0; i < entities.Count; i++) {
+                                        Entity entity = entities [i];
 
-                try {
-                    foreach (int ent_id in GameManager.Instance.World.Entities.dict.Keys) {
-                        try {
-                            Entity entity = GameManager.Instance.World.Entities.dict [ent_id];
+                                        if (entity is EntityEnemy) {
+                                                if (entity.IsAlive ())
+                                                        _list.Add (entity as EntityEnemy);
+                                        }
+                                }
+                        }
+                        catch (Exception e) {
+                                Log.Exception (e);
+                        }
+                }
 
-                            if (entity.entityType == EntityType.Zombie) {
-                                EntityEnemy ee = (EntityEnemy)entity;
+                public static int GetCount () {
+                        int count = 0;
+                        try {
+                                List<Entity> entities = GameManager.Instance.World.Entities.list;
+                                for (int i = 0; i < entities.Count; i++) {
+                                        Entity entity = entities [i];
 
-                                if (ee.IsAlive ())
-                                    lst.Add (ee);
-                            }
-                        }
-                        catch { }
-                    }
-                }
-                catch { }
+                                        if (entity.entityType == EntityType.Zombie) {
+                                                EntityEnemy ee = (EntityEnemy)entity;
 
-                return lst;
-            }
-        }
-
-        public static int Count {
-            get { return List.Count; }
-        }
-    }
+                                                if (ee.IsAlive ())
+                                                        count++;
+                                        }
+                                }
+                        }
+                        catch (Exception e) {
+                                Log.Exception (e);
+                        }
+                        return count;
+                }
+        }
 }
 

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

@@ -9 +9 @@
                 {
                         try {
-                                ItemList.Instance.Init ();
-
                                 PersistentData.PersistentContainer.Load ();
                         } catch (Exception e) {