Paper/Spigot-Server-Patches/0374-Optimize-Captured-TileEntity-Lookup.patch

36 lines
1.5 KiB
Diff
Raw Normal View History

2019-09-29 22:02:04 +02:00
From 44377891791b199d2a2e184c905942fe07ae24a5 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 TileEntity Lookup
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/server/World.java b/src/main/java/net/minecraft/server/World.java
2019-09-29 22:02:04 +02:00
index dad0c893f..dd2a9c6e5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2019-07-20 06:01:24 +02:00
@@ -1082,12 +1082,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
return null;
} else {
// CraftBukkit start
- if (capturedTileEntities.containsKey(blockposition)) {
- return capturedTileEntities.get(blockposition);
+ TileEntity tileentity = null; // Paper
+ if (!capturedTileEntities.isEmpty() && (tileentity = capturedTileEntities.get(blockposition)) != null) { // Paper
+ return tileentity; // Paper
}
// CraftBukkit end
- TileEntity tileentity = null;
+ //TileEntity tileentity = null; // Paper - move up
2019-05-05 19:19:34 +02:00
if (this.tickingTileEntities) {
2019-07-20 06:01:24 +02:00
tileentity = this.A(blockposition);
--
2019-09-29 22:02:04 +02:00
2.23.0