3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 11:30:06 +01:00
Paper/patches/server/0283-Optimize-Captured-BlockEntity-Lookup.patch

31 Zeilen
1.7 KiB
Diff

2021-06-13 13:40:34 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 6 Apr 2019 10:16:48 -0400
Subject: [PATCH] Optimize Captured BlockEntity Lookup
2021-06-13 13:40:34 +02:00
upstream was doing a containsKey/get pattern, and always doing it at that.
that scenario is only even valid if were in the middle of a block place.
Optimize to check if the captured list even has values in it, and also to
just do a get call since the value can never be null.
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
2024-10-23 15:02:51 +02:00
index 70b6d75daa9a9305041a565808f0dae84696d10f..dc38a23f027b4fe516f3963632d01f66c02b0681 100644
2021-06-13 13:40:34 +02:00
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
2024-10-23 15:02:51 +02:00
@@ -872,9 +872,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2021-06-13 13:40:34 +02:00
@Nullable
2021-11-24 04:42:31 +01:00
public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
2021-06-13 13:40:34 +02:00
- if (this.capturedTileEntities.containsKey(blockposition)) {
- return this.capturedTileEntities.get(blockposition);
+ // Paper start - Perf: Optimize capturedTileEntities lookup
2021-06-13 13:40:34 +02:00
+ net.minecraft.world.level.block.entity.BlockEntity blockEntity;
+ if (!this.capturedTileEntities.isEmpty() && (blockEntity = this.capturedTileEntities.get(blockposition)) != null) {
+ return blockEntity;
}
+ // Paper end - Perf: Optimize capturedTileEntities lookup
2021-06-13 13:40:34 +02:00
// CraftBukkit end
return this.isOutsideBuildHeight(blockposition) ? null : (!this.isClientSide && Thread.currentThread() != this.thread ? null : this.getChunkAt(blockposition).getBlockEntity(blockposition, LevelChunk.EntityCreationType.IMMEDIATE));
2021-06-13 13:40:34 +02:00
}