performance improvement for CraftChunk.getEntities() (#2629)
This commit is contained in:
parent
419ae0e668
commit
9ea1f9ee3d
|
@ -0,0 +1,38 @@
|
||||||
|
From 62af6667746cc668375eb2e6f02352fbcded8c7c Mon Sep 17 00:00:00 2001
|
||||||
|
From: wea_ondara <wea_ondara@alpenblock.net>
|
||||||
|
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 b4551614..373bea4b 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
|
@@ -110,14 +110,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.23.0
|
||||||
|
|
Loading…
Reference in New Issue