mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
1ab021ddca
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
Bukkit Changes:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
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 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 f6c785c1368c1bc1d626a90ffe64638f42775607..5900b1a9cb67f6d449907fda067619f604442bf2 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -905,12 +905,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
|
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.E(blockposition);
|