Fix loading and saving tile entity nbt for 1.16.x

Brokkonaut · Feb 22, 2021 · 24c7f15 · 24c7f15
1 parent febef83
commit 24c7f15
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/libnbt-v1_16_R1/src/main/java/org/cyberiantiger/minecraft/unsafe/v1_16_R1/NBTTools.java b/libnbt-v1_16_R1/src/main/java/org/cyberiantiger/minecraft/unsafe/v1_16_R1/NBTTools.java
@@ -321,11 +321,11 @@ public void writeTileEntity(Block block, CompoundTag tag) {
         if (tileEntity == null) {
             return;
         }
-        tileEntity.save(toNativeCompound(tag));
-        tileEntity.update();
         BlockPosition pos = new BlockPosition(block.getX(), block.getY(), block.getZ());
         WorldServer handle = craftWorld.getHandle();
         IBlockData blockData = handle.getType(pos);
+        tileEntity.load(blockData, toNativeCompound(tag));
+        tileEntity.update();
         craftWorld.getHandle().notify(new BlockPosition(block.getX(), block.getY(), block.getZ()), blockData, blockData, 3);
     }
 
@@ -337,9 +337,8 @@ public CompoundTag readTileEntity(Block block) {
         if (tileEntity == null) {
             return null;
         }
-        IBlockData blockData = craftWorld.getHandle().getType(pos);
         NBTTagCompound tag = new NBTTagCompound();
-        tileEntity.load(blockData, tag);
+        tileEntity.save(tag);
         return fromNativeCompound(tag);
     }
 

diff --git a/libnbt-v1_16_R2/src/main/java/org/cyberiantiger/minecraft/unsafe/v1_16_R2/NBTTools.java b/libnbt-v1_16_R2/src/main/java/org/cyberiantiger/minecraft/unsafe/v1_16_R2/NBTTools.java
@@ -321,11 +321,11 @@ public void writeTileEntity(Block block, CompoundTag tag) {
         if (tileEntity == null) {
             return;
         }
-        tileEntity.save(toNativeCompound(tag));
-        tileEntity.update();
         BlockPosition pos = new BlockPosition(block.getX(), block.getY(), block.getZ());
         WorldServer handle = craftWorld.getHandle();
         IBlockData blockData = handle.getType(pos);
+        tileEntity.load(blockData, toNativeCompound(tag));
+        tileEntity.update();
         craftWorld.getHandle().notify(new BlockPosition(block.getX(), block.getY(), block.getZ()), blockData, blockData, 3);
     }
 
@@ -337,9 +337,8 @@ public CompoundTag readTileEntity(Block block) {
         if (tileEntity == null) {
             return null;
         }
-        IBlockData blockData = craftWorld.getHandle().getType(pos);
         NBTTagCompound tag = new NBTTagCompound();
-        tileEntity.load(blockData, tag);
+        tileEntity.save(tag);
         return fromNativeCompound(tag);
     }
 

diff --git a/libnbt-v1_16_R3/src/main/java/org/cyberiantiger/minecraft/unsafe/v1_16_R3/NBTTools.java b/libnbt-v1_16_R3/src/main/java/org/cyberiantiger/minecraft/unsafe/v1_16_R3/NBTTools.java
@@ -321,11 +321,11 @@ public void writeTileEntity(Block block, CompoundTag tag) {
         if (tileEntity == null) {
             return;
         }
-        tileEntity.save(toNativeCompound(tag));
-        tileEntity.update();
         BlockPosition pos = new BlockPosition(block.getX(), block.getY(), block.getZ());
         WorldServer handle = craftWorld.getHandle();
         IBlockData blockData = handle.getType(pos);
+        tileEntity.load(blockData, toNativeCompound(tag));
+        tileEntity.update();
         craftWorld.getHandle().notify(new BlockPosition(block.getX(), block.getY(), block.getZ()), blockData, blockData, 3);
     }
 
@@ -337,9 +337,8 @@ public CompoundTag readTileEntity(Block block) {
         if (tileEntity == null) {
             return null;
         }
-        IBlockData blockData = craftWorld.getHandle().getType(pos);
         NBTTagCompound tag = new NBTTagCompound();
-        tileEntity.load(blockData, tag);
+        tileEntity.save(tag);
         return fromNativeCompound(tag);
     }