more patches
This commit is contained in:
parent
123a41d132
commit
27a8d6da9a
32 changed files with 825 additions and 1168 deletions
|
@ -0,0 +1,37 @@
|
|||
From 0000000000000000000000000000000000000000 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().
|
||||
|
||||
1.17: needs to be reworked, entities not in chunk anymore?
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
index 74bad15034d9d55fb70931f38868f812160c6305..0f45f4b2486e910d11fd94b260bcd68e49eae31e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
@@ -116,14 +116,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.world.entity.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.world.entity.Entity entity : chunk.entitySlices[i]) {
|
||||
+ if (entity == null) {
|
||||
continue;
|
||||
}
|
||||
-
|
||||
- entities[index++] = ((net.minecraft.world.entity.Entity) obj).getBukkitEntity();
|
||||
+ entities[index++] = entity.getBukkitEntity();
|
||||
}
|
||||
+ // Paper end
|
||||
}
|
||||
|
||||
return entities;
|
Loading…
Add table
Add a link
Reference in a new issue