Avoid doing unnecessary range checks when we're looping from start to end.

Make EntityLiving call AI logic every tick again.
Rework PathfinderGoalSelector logic.

Adds UnsafeList for use in places where we use ArrayList and know we won't
get index out of range errors. Added usage to World's tickEntities, Chunk's
entitySlices to speed up searching for entities, and to PathfinderGoalSelector
to speed up dealing with AI goals.

Reworked logic in PathfinderGoalSelector with help from fullwall. This code
no longer uses an extra ArrayList for setting up goals and only updates which
goals should be run every other time it is called.

Removed only calling PathfinderGoalSelector every other tick from EntityLiving
as we now only setup new goals every other tick. This ensures existing goals
run every tick to properly update mob movement.

4 files changed, 53 insertions, 44 deletions

diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 814886ef..9aa52174 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import org.bukkit.Bukkit; // CraftBukkit
+import org.bukkit.craftbukkit.util.UnsafeList; // CraftBukkit
 
 public class Chunk {
 
@@ -53,7 +54,7 @@ public class Chunk {
         this.heightMap = new int[256];
 
         for (int k = 0; k < this.entitySlices.length; ++k) {
-            this.entitySlices[k] = new ArrayList();
+            this.entitySlices[k] = new UnsafeList(); // CraftBukkit - use UnsafeList
         }
 
         Arrays.fill(this.b, -999);
@@ -697,10 +698,10 @@ public class Chunk {
         }
 
         for (int k = i; k <= j; ++k) {
-            List list1 = this.entitySlices[k];
+            UnsafeList list1 = (UnsafeList) this.entitySlices[k]; // CraftBukkit - use UnsafeList
 
             for (int l = 0; l < list1.size(); ++l) {
-                Entity entity1 = (Entity) list1.get(l);
+                Entity entity1 = (Entity) list1.unsafeGet(l); // CraftBukkit - use unsafeGet
 
                 if (entity1 != entity && entity1.boundingBox.a(axisalignedbb)) {
                     list.add(entity1);
@@ -736,10 +737,10 @@ public class Chunk {
         }
 
         for (int k = i; k <= j; ++k) {
-            List list1 = this.entitySlices[k];
+            UnsafeList list1 = (UnsafeList) this.entitySlices[k]; // CraftBukkit - use UnsafeList
 
             for (int l = 0; l < list1.size(); ++l) {
-                Entity entity = (Entity) list1.get(l);
+                Entity entity = (Entity) list1.unsafeGet(l); // CraftBukkit - use unsafeGet
 
                 if (oclass.isAssignableFrom(entity.getClass()) && entity.boundingBox.a(axisalignedbb)) {
                     list.add(entity);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1f192275..83933467 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1095,22 +1095,22 @@ public abstract class EntityLiving extends Entity {
                 d1 += 1.0D;
                 this.setPosition(d0, d1, d2);
             }
-            //List list = this.world.getCubes(this, this.boundingBox.shrink(0.03125D, 0.0D, 0.03125D));
+            /*List list = this.world.getCubes(this, this.boundingBox.shrink(0.03125D, 0.0D, 0.03125D));
 
-            //if (list.size() > 0) {
-            //    double d4 = 0.0D;
+            if (list.size() > 0) {
+                double d4 = 0.0D;
 
-            //    for (int i = 0; i < list.size(); ++i) {
-            //        AxisAlignedBB axisalignedbb = (AxisAlignedBB) list.get(i);
+                for (int i = 0; i < list.size(); ++i) {
+                    AxisAlignedBB axisalignedbb = (AxisAlignedBB) list.get(i);
 
-            //        if (axisalignedbb.e > d4) {
-            //            d4 = axisalignedbb.e;
-            //        }
-            //    }
+                    if (axisalignedbb.e > d4) {
+                        d4 = axisalignedbb.e;
+                    }
+                }
 
-            //    d1 += d4 - this.boundingBox.b;
-            //    this.setPosition(d0, d1, d2);
-            //}
+                d1 += d4 - this.boundingBox.b;
+                this.setPosition(d0, d1, d2);
+            }*/
             // CraftBukkit end
         }
 
@@ -1240,14 +1240,10 @@ public abstract class EntityLiving extends Entity {
         this.m.a();
         //MethodProfiler.a(); // CraftBukkit - not in production code
         //MethodProfiler.a("targetSelector"); // CraftBukkit - not in production code
-        // CraftBukkit start - run goal selectors every other tick
-        if ((this.aV & 1) == 0) {
-            this.targetSelector.a();
+        this.targetSelector.a();
         //MethodProfiler.a(); // CraftBukkit - not in production code
         //MethodProfiler.a("goalSelector"); // CraftBukkit - not in production code
-            this.goalSelector.a();
-        }
-        // CraftBukkit end
+        this.goalSelector.a();
         //MethodProfiler.a(); // CraftBukkit - not in production code
         //MethodProfiler.a("navigation"); // CraftBukkit - not in production code
         this.navigation.d();
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 054777c4..90350e29 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -2,12 +2,15 @@ package net.minecraft.server;
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import org.bukkit.craftbukkit.util.UnsafeList; // CraftBukkit
 
 public class PathfinderGoalSelector {
 
-    private ArrayList a = new ArrayList();
-    private ArrayList b = new ArrayList();
-    private ArrayList arraylist = new ArrayList(); // CraftBukkit - create list for object reuse
+    // CraftBukkit start - use UnsafeList, add boolean for picking goals
+    private UnsafeList a = new UnsafeList(16);
+    private UnsafeList b = new UnsafeList(16);
+    boolean oddCall = true;
+    // CraftBukkit end
 
     public PathfinderGoalSelector() {}
 
@@ -16,12 +19,12 @@ public class PathfinderGoalSelector {
     }
 
     public void a() {
-        //ArrayList arraylist = new ArrayList(); // CraftBukkit
-        arraylist.clear(); // CraftBukkit - prepare reused list
+        //ArrayList arraylist = new ArrayList(); // CraftBukkit - removed usage
 
-        // CraftBukkit start - don't use iterators for private fields
+        // CraftBukkit start - don't use iterators for private fields, only run every other call
+        if (oddCall) {
         for (int i = 0; i < this.a.size(); i++) {
-            PathfinderGoalSelectorItem pathfindergoalselectoritem = (PathfinderGoalSelectorItem) this.a.get(i);
+            PathfinderGoalSelectorItem pathfindergoalselectoritem = (PathfinderGoalSelectorItem) this.a.unsafeGet(i); // CraftBukkit - use unsafeGet
             boolean flag = this.b.contains(pathfindergoalselectoritem);
 
             if (flag) {
@@ -34,36 +37,44 @@ public class PathfinderGoalSelector {
             }
 
             if (this.a(pathfindergoalselectoritem) && pathfindergoalselectoritem.a.a()) {
-                arraylist.add(pathfindergoalselectoritem);
+                // CraftBukkit start - call method now
+                // arraylist.add(pathfindergoalselectoritem);
+                pathfindergoalselectoritem.a.c();
+                // CraftBukkit end
                 this.b.add(pathfindergoalselectoritem);
             }
         }
+        }
+        oddCall = !oddCall;
         // CraftBukkit end
 
         boolean flag1 = false;
 
-        if (flag1 && arraylist.size() > 0) {
+        // CraftBukkit start - removed usage of arraylist
+        /*if (flag1 && arraylist.size() > 0) {
             System.out.println("Starting: ");
-        }
+        }*/
+        // CraftBukkit end
 
         Iterator iterator1;
         PathfinderGoalSelectorItem pathfindergoalselectoritem1;
 
-        //CraftBukkit start - don't use iterators for private fields
-        for (int i = 0; i < arraylist.size(); i++) {
-            pathfindergoalselectoritem1 = (PathfinderGoalSelectorItem) arraylist.get(i);
-            pathfindergoalselectoritem1.a.c();
+        // CraftBukkit start - removed usage of arraylist
+        /*for (iterator1 = arraylist.iterator(); iterator1.hasNext(); pathfindergoalselectoritem1.a.c()) {
+            pathfindergoalselectoritem1 = (PathfinderGoalSelectorItem) iterator1.next();
             if (flag1) {
                 System.out.println(pathfindergoalselectoritem1.a.toString() + ", ");
             }
-        }
+        }*/
+        // CraftBukkit end
 
         if (flag1 && this.b.size() > 0) {
             System.out.println("Running: ");
         }
 
+        // CraftBukkit start - don't use iterators for private fields
         for (int i = 0; i < this.b.size(); i++) {
-            pathfindergoalselectoritem1 = (PathfinderGoalSelectorItem) this.b.get(i);
+            pathfindergoalselectoritem1 = (PathfinderGoalSelectorItem) this.b.unsafeGet(i); // CraftBukkit - use unsafeGet
             pathfindergoalselectoritem1.a.e();
             if (flag1) {
                 System.out.println(pathfindergoalselectoritem1.a.toString());
@@ -75,14 +86,14 @@ public class PathfinderGoalSelector {
     private boolean a(PathfinderGoalSelectorItem pathfindergoalselectoritem) {
         // CraftBukkit start - don't use iterators for private fields
         for (int i = 0; i < this.a.size(); i++) {
-            PathfinderGoalSelectorItem pathfindergoalselectoritem1 = (PathfinderGoalSelectorItem) this.a.get(i);
+            PathfinderGoalSelectorItem pathfindergoalselectoritem1 = (PathfinderGoalSelectorItem) this.a.unsafeGet(i); // CraftBukkit - use unsafeGet
 
             if (pathfindergoalselectoritem1 != pathfindergoalselectoritem) {
                 if (pathfindergoalselectoritem.b >= pathfindergoalselectoritem1.b) {
-                    if (this.b.contains(pathfindergoalselectoritem1) && !this.a(pathfindergoalselectoritem, pathfindergoalselectoritem1)) {
+                    if (!this.a(pathfindergoalselectoritem, pathfindergoalselectoritem1) && this.b.contains(pathfindergoalselectoritem1)) { // CraftBukkit - switch order
                         return false;
                     }
-                } else if (this.b.contains(pathfindergoalselectoritem1) && !pathfindergoalselectoritem1.a.g()) {
+                } else if (!pathfindergoalselectoritem1.a.g() && this.b.contains(pathfindergoalselectoritem1)) { // CraftBukkit - switch order
                     return false;
                 }
             }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b5879e82..3d7cdfc9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -20,6 +20,7 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.craftbukkit.util.UnsafeList;
 import org.bukkit.event.block.BlockCanBuildEvent;
 import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.block.BlockFormEvent;
@@ -40,7 +41,7 @@ public class World implements IBlockAccess {
     private List J = new ArrayList();
     private List K = new ArrayList();
     public List players = new ArrayList();
-    public List e = new ArrayList();
+    public UnsafeList e = new UnsafeList(); // CraftBukkit - use UnsafeList
     private long L = 16777215L;
     public int f = 0;
     protected int g = (new Random()).nextInt();
@@ -1104,7 +1105,7 @@ public class World implements IBlockAccess {
         Entity entity;
 
         for (i = 0; i < this.e.size(); ++i) {
-            entity = (Entity) this.e.get(i);
+            entity = (Entity) this.e.unsafeGet(i); // CraftBukkit - use unsafeGet
             // CraftBukkit start - fixed an NPE
             if (entity == null) {
                 continue;