fix: Fix BalmData not persisting after death on Forge

TwelveIterationMods · Jun 24, 2024 · 3b12ee5 · 3b12ee5
1 parent 187d48d
commit 3b12ee5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/forge/src/main/java/net/blay09/mods/balm/forge/ForgeBalmHooks.java b/forge/src/main/java/net/blay09/mods/balm/forge/ForgeBalmHooks.java
@@ -7,6 +7,7 @@
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.Container;
 import net.minecraft.world.InteractionHand;
@@ -49,6 +50,12 @@ public boolean growCrop(ItemStack itemStack, Level level, BlockPos pos, Player p
     @Override
     public CompoundTag getPersistentData(Entity entity) {
         CompoundTag persistentData = entity.getPersistentData();
+        if (entity instanceof ServerPlayer) {
+            CompoundTag persistedTag = persistentData.getCompound(ServerPlayer.PERSISTED_NBT_TAG);
+            persistentData.put(ServerPlayer.PERSISTED_NBT_TAG, persistedTag);
+            persistentData = persistedTag;
+        }
+
         CompoundTag balmData = persistentData.getCompound("BalmData");
         if (balmData.isEmpty()) {
             // If we have no data, try to import from Fabric in case the world was migrated

diff --git a/neoforge/src/main/java/net/blay09/mods/balm/neoforge/NeoForgeBalmHooks.java b/neoforge/src/main/java/net/blay09/mods/balm/neoforge/NeoForgeBalmHooks.java
@@ -55,11 +55,13 @@ public CompoundTag getPersistentData(Entity entity) {
         }
 
         CompoundTag balmData = persistentData.getCompound("BalmData");
-        if (balmData.size() == 0) {
+        if (balmData.isEmpty()) {
             // If we have no data, try to import from Fabric in case the world was migrated
             balmData = ((BalmEntity) entity).getFabricBalmData();
         }
-        persistentData.put("BalmData", balmData);
+        if (!balmData.isEmpty()) {
+            persistentData.put("BalmData", balmData);
+        }
 
         return balmData;
     }