Paper/nms-patches/TileEntity.patch

50 Zeilen
1.6 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntity.java
+++ b/net/minecraft/server/TileEntity.java
2016-11-17 02:41:03 +01:00
@@ -4,6 +4,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.bukkit.inventory.InventoryHolder; // CraftBukkit
+
public abstract class TileEntity {
2019-04-25 04:00:00 +02:00
private static final Logger LOGGER = LogManager.getLogger();
2019-04-23 04:00:00 +02:00
@@ -55,8 +57,15 @@
2018-07-15 02:00:00 +02:00
}
}
+ // 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
String s = nbttagcompound.getString("id");
2019-04-23 04:00:00 +02:00
return (TileEntity) IRegistry.BLOCK_ENTITY_TYPE.getOptional(new MinecraftKey(s)).map((tileentitytypes) -> {
@@ -68,6 +77,7 @@
}
}).map((tileentity) -> {
2018-07-15 02:00:00 +02:00
try {
+ tileentity.setWorld(world); // CraftBukkit
tileentity.load(nbttagcompound);
2019-04-23 04:00:00 +02:00
return tileentity;
} catch (Throwable throwable) {
@@ -157,4 +167,13 @@
public TileEntityTypes<?> q() {
return this.b;
}
+
+ // CraftBukkit start - add method
+ public InventoryHolder getOwner() {
+ if (world == null) return null;
+ org.bukkit.block.BlockState state = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()).getState();
+ if (state instanceof InventoryHolder) return (InventoryHolder) state;
+ return null;
+ }
+ // CraftBukkit end
}