mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 07:09:21 +08:00
b62dfa0bf9
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: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From fd9f6e2cb6863164a3278578726543c6011140e0 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 22 Jul 2017 15:22:59 +0100
|
|
Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
|
|
to avoid exeptions when calling getTileEntity
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index f9b4f314ce..65fe50882b 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -234,6 +234,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
result = fixTileEntity(pos, type, result);
|
|
}
|
|
}
|
|
+ // Paper Start - add TE fix checks for shulkers, see nms.BlockShulkerBox
|
|
+ else if (type instanceof BlockShulkerBox) {
|
|
+ if (!(result instanceof TileEntityShulkerBox)) {
|
|
+ result = fixTileEntity(pos, type, result);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
|
|
return result;
|
|
}
|
|
--
|
|
2.19.0
|
|
|