2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
36 Zeilen
1.5 KiB
Diff
36 Zeilen
1.5 KiB
Diff
From 23f3d0db1d1c00b42cd80431fafacc551af8056a 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
|
|
index 0324191551..177ea8f4cd 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1049,12 +1049,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
|
|
|
|
if (this.tickingTileEntities) {
|
|
tileentity = this.B(blockposition);
|
|
--
|
|
2.21.0
|
|
|