From e4e41e06f9557a9f8699f3e46a08e0a120153e71 Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Thu, 10 Oct 2019 11:29:42 +0200 Subject: [PATCH] Performance improvement for Chunk.getEntities This patch aims to reduce performance cost used by collecting the entities of a chunk. Previously the entitySlices were copied into an extra array with List.toArray() with is a costly and unneccessary operation. This patch will reduce the load of plugins which for example implement custom moblimits and depend on Chunk.getEntities(). diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java index a53bb7295c..3de9b1c594 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -111,14 +111,14 @@ public class CraftChunk implements Chunk { Entity[] entities = new Entity[count]; for (int i = 0; i < 16; i++) { - - for (Object obj : chunk.entitySlices[i].toArray()) { - if (!(obj instanceof net.minecraft.server.Entity)) { + // Paper start - speed up (was with chunk.entitySlices[i].toArray() and cast checks which costs a lot of performance if called often) + for (net.minecraft.server.Entity entity : chunk.entitySlices[i]) { + if (entity == null) { continue; } - - entities[index++] = ((net.minecraft.server.Entity) obj).getBukkitEntity(); + entities[index++] = entity.getBukkitEntity(); } + // Paper end } return entities; -- 2.26.2