mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 07:09:21 +08:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1dFix some tests randomly failing997d378dFix client stall in specific teleportation scenariosb3dc2366SPIGOT-4307: Fix hacky API for banners on shields2a271162SPIGOT-4301: Fix more invalid enchants5d0d83bbSPIGOT-4309: Add "forced" display of particlesa6772578Add additional tests for CraftBlockDatace1af0c3Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From aa533892a0d710314855e69f85c2cf10f09bc992 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 e58b21ae43..e4ba13cec5 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
|
|
|