summaryrefslogtreecommitdiffstats
path: root/nms-patches/TileEntity.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-15 10:00:00 +1000
committermd_5 <git@md-5.net>2018-07-15 10:00:00 +1000
commit421c1728c81e2f729dff88da2ac96535d2b8e5e8 (patch)
tree6c51d93e811d1eb86b68461a42fc5cf03b168b0c /nms-patches/TileEntity.patch
parent57ab4cfc6f4ff526d44319d9b8c79f6848db2de7 (diff)
downloadcraftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.gz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.lz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.xz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.zip
Update to Minecraft 1.13-pre7
Diffstat (limited to 'nms-patches/TileEntity.patch')
-rw-r--r--nms-patches/TileEntity.patch30
1 files changed, 27 insertions, 3 deletions
diff --git a/nms-patches/TileEntity.patch b/nms-patches/TileEntity.patch
index 6ebe08e9..b0dbdfbc 100644
--- a/nms-patches/TileEntity.patch
+++ b/nms-patches/TileEntity.patch
@@ -9,9 +9,33 @@
public abstract class TileEntity {
private static final Logger a = LogManager.getLogger();
-@@ -251,4 +253,13 @@
- a("shulker_box", TileEntityShulkerBox.class);
- a("bed", TileEntityBed.class);
+@@ -54,8 +56,15 @@
+ }
+ }
+
++ // CraftBukkit start
+ @Nullable
+ public static TileEntity create(NBTTagCompound nbttagcompound) {
++ return create(nbttagcompound, null);
++ }
++
++ @Nullable
++ public static TileEntity create(NBTTagCompound nbttagcompound, @Nullable World world) {
++ // CraftBukkit end
+ TileEntity tileentity = null;
+ String s = nbttagcompound.getString("id");
+
+@@ -67,6 +76,7 @@
+
+ if (tileentity != null) {
+ try {
++ tileentity.setWorld(world); // CraftBukkit
+ tileentity.load(nbttagcompound);
+ } catch (Throwable throwable1) {
+ TileEntity.a.error("Failed to load data for block entity {}", s, throwable1);
+@@ -156,4 +166,13 @@
+ public TileEntityTypes<?> C() {
+ return this.e;
}
+
+ // CraftBukkit start - add method