From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar 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/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index c8542636e89748699d608eb29569cacb6321d334..5193271bc257248e0d2bc9d9a477e999a97deada 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -968,12 +968,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return null; } else { // CraftBukkit start - if (capturedTileEntities.containsKey(blockposition)) { - return capturedTileEntities.get(blockposition); + BlockEntity tileentity = null; // Paper + if (!capturedTileEntities.isEmpty() && (tileentity = capturedTileEntities.get(blockposition)) != null) { // Paper + return tileentity; // Paper } // CraftBukkit end - BlockEntity tileentity = null; + //TileEntity tileentity = null; // Paper - move up if (this.updatingBlockEntities) { tileentity = this.getPendingBlockEntityAt(blockposition);