Paper/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch

80 lines
3.2 KiB
Diff
Raw Normal View History

From c3cc0f09b0bcc0b21478def0b640d8df972bfebe Mon Sep 17 00:00:00 2001
2015-02-20 11:34:11 +01:00
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:33:36 +1100
Subject: [PATCH] Use Standard List for EntitySlices.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 994903f..022ba31 100644
2015-02-20 11:34:11 +01:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -31,7 +31,7 @@ public class Chunk {
public final int locZ;
private boolean k;
2015-02-28 12:36:22 +01:00
public final Map<BlockPosition, TileEntity> tileEntities;
- public final EntitySlice<Entity>[] entitySlices;
2015-02-28 12:36:22 +01:00
+ public final List<Entity>[] entitySlices; // Spigot
private boolean done;
2015-02-20 11:34:11 +01:00
private boolean lit;
private boolean p;
2015-03-22 20:50:13 +01:00
@@ -80,14 +80,14 @@ public class Chunk {
2015-02-20 11:34:11 +01:00
this.tileEntities = Maps.newHashMap();
this.v = 4096;
this.w = Queues.newConcurrentLinkedQueue();
- this.entitySlices = (EntitySlice[]) (new EntitySlice[16]);
+ this.entitySlices = (List[]) (new List[16]); // Spigot
this.world = world;
this.locX = i;
this.locZ = j;
2015-03-22 20:50:13 +01:00
this.heightMap = new int[256];
2015-02-20 11:34:11 +01:00
for (int k = 0; k < this.entitySlices.length; ++k) {
- this.entitySlices[k] = new EntitySlice(Entity.class);
+ this.entitySlices[k] = new org.bukkit.craftbukkit.util.UnsafeList(); // Spigot
}
2015-03-22 20:50:13 +01:00
Arrays.fill(this.f, -999);
@@ -924,12 +924,12 @@ public class Chunk {
2015-02-20 11:34:11 +01:00
j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
for (int k = i; k <= j; ++k) {
2015-02-28 12:36:22 +01:00
- Iterator iterator = this.entitySlices[k].c(oclass).iterator();
2015-02-20 11:34:11 +01:00
+ Iterator iterator = this.entitySlices[k].iterator(); // Spigot
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
2015-02-28 12:36:22 +01:00
- if (entity.getBoundingBox().b(axisalignedbb) && (predicate == null || predicate.apply((T) entity))) { // CraftBukkit - fix decompile error
+ if (oclass.isInstance(entity) && entity.getBoundingBox().b(axisalignedbb) && (predicate == null || predicate.apply((T) entity))) { // CraftBukkit - fix decompile error // Spigot
list.add((T) entity); // Fix decompile error
2015-02-20 11:34:11 +01:00
}
}
2015-03-22 20:50:13 +01:00
@@ -1309,7 +1309,7 @@ public class Chunk {
2015-02-20 11:34:11 +01:00
return this.tileEntities;
}
2015-02-28 12:36:22 +01:00
- public EntitySlice<Entity>[] getEntitySlices() {
+ public List<Entity>[] getEntitySlices() {
2015-02-20 11:34:11 +01:00
return this.entitySlices;
}
2015-02-20 11:38:01 +01:00
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
2015-02-28 12:36:22 +01:00
index 0143623..621a717 100644
2015-02-20 11:38:01 +01:00
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -141,9 +141,9 @@ public class ActivationRange
*/
private static void activateChunkEntities(Chunk chunk)
{
- for ( EntitySlice slice : chunk.entitySlices )
+ for ( List<Entity> slice : chunk.entitySlices )
{
- for ( Entity entity : (Set<Entity>) slice )
+ for ( Entity entity : slice )
{
if ( MinecraftServer.currentTick > entity.activatedTick )
{
2015-02-20 11:34:11 +01:00
--
2015-05-09 22:23:26 +02:00
2.1.4
2015-02-20 11:34:11 +01:00