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

Timestamp:

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

Author:

alloc

Message:

Fixes update A16.2

File:

• binary-improvements/7dtd-server-fixes/src/LiveData/Animals.cs (modified) (1 diff)

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; }
-        }
     }
 }