From b1fafd6a88339fdb3dc8f8685173c674bcf09c10 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 16:21:55 +0500
Subject: [PATCH] Added simple entity ticking caching

---
 .../0066-Entity-ticking-chunk-caching.patch   | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 CraftBukkit-Patches/0066-Entity-ticking-chunk-caching.patch

diff --git a/CraftBukkit-Patches/0066-Entity-ticking-chunk-caching.patch b/CraftBukkit-Patches/0066-Entity-ticking-chunk-caching.patch
new file mode 100644
index 0000000000..8020b5e373
--- /dev/null
+++ b/CraftBukkit-Patches/0066-Entity-ticking-chunk-caching.patch
@@ -0,0 +1,67 @@
+From 86d9d652ef35abc3f1f29706f5c0fd4429779540 Mon Sep 17 00:00:00 2001
+From: Ammar Askar <ammar@ammaraskar.com>
+Date: Tue, 16 Jul 2013 03:32:32 +0500
+Subject: [PATCH] Entity ticking chunk caching
+
+Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations
+
+
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 8bd7876..ba1c1ca 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -1221,6 +1221,7 @@ public abstract class World implements IBlockAccess {
+         CrashReport crashreport;
+         CrashReportSystemDetails crashreportsystemdetails;
+ 
++        long lastChunk = Long.MIN_VALUE; // Spigot - cache chunk x, z cords for unload queue
+         for (i = 0; i < this.i.size(); ++i) {
+             entity = (Entity) this.i.get(i);
+             // CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload
+@@ -1229,10 +1230,15 @@ public abstract class World implements IBlockAccess {
+             }
+ 
+             ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
+-            if (chunkProviderServer.unloadQueue.contains(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4)) {
+-                continue;
++            // Spigot start - check last chunk to see if this loaded (fast cache)
++            long chunk = org.bukkit.craftbukkit.util.LongHash.toLong(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4);
++            if (lastChunk != chunk) {
++                if (chunkProviderServer.unloadQueue.contains(chunk)) { // Spigot end
++                    continue;
++                }
+             }
+             // CraftBukkit end
++            lastChunk = chunk; // Spigot
+ 
+             try {
+                 ++entity.ticksLived;
+@@ -1253,6 +1259,7 @@ public abstract class World implements IBlockAccess {
+                 this.i.remove(i--);
+             }
+         }
++        lastChunk = Long.MIN_VALUE; // Spigot
+ 
+         this.methodProfiler.c("remove");
+         this.entityList.removeAll(this.f);
+@@ -1283,10 +1290,15 @@ public abstract class World implements IBlockAccess {
+ 
+             // CraftBukkit start - Don't tick entities in chunks queued for unload
+             ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
+-            if (chunkProviderServer.unloadQueue.contains(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4)) {
+-                continue;
++            // Spigot start - check last chunk to see if this loaded (fast cache)
++            long chunk = org.bukkit.craftbukkit.util.LongHash.toLong(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4);
++            if (lastChunk != chunk) {
++                if (chunkProviderServer.unloadQueue.contains(chunk)) { // Spigot end
++                    continue;
++                }
+             }
+             // CraftBukkit end
++            lastChunk = Long.MIN_VALUE; // Spigot
+ 
+             if (entity.vehicle != null) {
+                 if (!entity.vehicle.dead && entity.vehicle.passenger == entity) {
+-- 
+1.8.1.msysgit.1
+