summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/World.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-04-23 09:47:05 -0500
committerEvilSeph <evilseph@gmail.com>2012-04-23 21:52:08 -0400
commitb7376e08651e32addce2ba986d02f6e53e3ecdf2 (patch)
tree96aebe992dad04b205e7f2781bb387d441734f14 /src/main/java/net/minecraft/server/World.java
parente8459c1ff6a8e58f6d7578a99ea164deadc30884 (diff)
downloadcraftbukkit-b7376e08651e32addce2ba986d02f6e53e3ecdf2.tar
craftbukkit-b7376e08651e32addce2ba986d02f6e53e3ecdf2.tar.gz
craftbukkit-b7376e08651e32addce2ba986d02f6e53e3ecdf2.tar.lz
craftbukkit-b7376e08651e32addce2ba986d02f6e53e3ecdf2.tar.xz
craftbukkit-b7376e08651e32addce2ba986d02f6e53e3ecdf2.zip
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.
Diffstat (limited to 'src/main/java/net/minecraft/server/World.java')
-rw-r--r--src/main/java/net/minecraft/server/World.java5
1 files changed, 3 insertions, 2 deletions
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;