mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From ff5fed386f5e6482a0e6479e31ee5ba4557d2b66 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 8f6ce6bf1a..5d5f6f6328 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.18.0
|
|
|