Changeset 326 for binary-improvements/7dtd-server-fixes/src/LiveData

Timestamp:

Sep 4, 2018, 2:33:52 PM (6 years ago)

Author:

alloc

Message:

More cleanup, allocation improvements

Location:

binary-improvements/7dtd-server-fixes/src/LiveData

Files:

• Animals.cs (modified) (1 diff)
• Hostiles.cs (modified) (1 diff)

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

@@ -4 +4 @@
 
                 protected override EntityAnimal predicate (Entity _e) {
-                        if (_e is EntityAnimal) {
-                                EntityAnimal ea = (EntityAnimal) _e;
-
-                                if (ea.IsAlive ()) {
-                                        return ea;
-                                }
+                        EntityAnimal ea = _e as EntityAnimal;
+                        if (ea != null && ea.IsAlive ()) {
+                                return ea;
                         }
 

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

@@ -4 +4 @@
 
                 protected override EntityEnemy predicate (Entity _e) {
-                        if (_e is EntityEnemy) {
-                                if (_e.IsAlive ()) {
-                                        return _e as EntityEnemy;
-                                }
+                        EntityEnemy enemy = _e as EntityEnemy;
+                        if (enemy != null && enemy.IsAlive ()) {
+                                return enemy;
                         }