PaperMC/nms-patches/TileEntity.patch

82 lines
3.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntity.java
+++ b/net/minecraft/server/TileEntity.java
2019-05-14 02:00:00 +02:00
@@ -4,9 +4,18 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
2019-05-14 02:00:00 +02:00
import org.apache.logging.log4j.util.Supplier;
+// CraftBukkit start
+import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
+import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
+import org.bukkit.inventory.InventoryHolder;
+// CraftBukkit end
public abstract class TileEntity {
+ // CraftBukkit start - data containers
+ private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
+ public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
+ // CraftBukkit end
2019-04-25 04:00:00 +02:00
private static final Logger LOGGER = LogManager.getLogger();
private final TileEntityTypes<?> b;
@Nullable
2019-05-14 02:00:00 +02:00
@@ -37,6 +46,12 @@
public void load(NBTTagCompound nbttagcompound) {
this.position = new BlockPosition(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z"));
+ // CraftBukkit start - read container
+ NBTTagCompound persistentDataTag = nbttagcompound.getCompound("PublicBukkitValues");
+ if (persistentDataTag != null) {
+ this.persistentDataContainer.putAll(persistentDataTag);
+ }
+ // CraftBukkit end
}
public NBTTagCompound save(NBTTagCompound nbttagcompound) {
2019-05-14 02:00:00 +02:00
@@ -53,12 +68,24 @@
nbttagcompound.setInt("x", this.position.getX());
nbttagcompound.setInt("y", this.position.getY());
nbttagcompound.setInt("z", this.position.getZ());
+ // CraftBukkit start - store container
+ if (!this.persistentDataContainer.isEmpty()) {
+ nbttagcompound.set("PublicBukkitValues", this.persistentDataContainer.toTagCompound());
+ }
+ // CraftBukkit end
return nbttagcompound;
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) -> {
2019-05-14 02:00:00 +02:00
@@ -70,6 +97,7 @@
2019-04-23 04:00:00 +02:00
}
}).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) {
2019-05-14 02:00:00 +02:00
@@ -168,4 +196,13 @@
}, this::getPosition});
}
}
+
+ // 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
}