Fixup LODESTONE_TRACKER rewriting in 1.20.3->.5 and backwards (#3862)

ViaVersion · May 19, 2024 · 052fb6e · 052fb6e
1 parent 7d9c6fe
commit 052fb6e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/...aversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/...aversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -469,10 +469,11 @@ public Item toStructuredItem(final UserConnection connection, final Item old) {
             data.set(StructuredDataKey.RECIPES, recipesTag);
         }
 
-        final CompoundTag lodestonePosTag = tag.getCompoundTag("LodestonePos");
-        final String lodestoneDimension = tag.getString("LodestoneDimension");
-        if (lodestonePosTag != null && lodestoneDimension != null) {
-            updateLodestoneTracker(tag, lodestonePosTag, lodestoneDimension, data);
+        final NumberTag trackedTag = tag.getNumberTag("LodestoneTracked");
+        if (trackedTag != null) {
+            final CompoundTag lodestonePosTag = tag.getCompoundTag("LodestonePos");
+            final String lodestoneDimension = tag.getString("LodestoneDimension");
+            updateLodestoneTracker(trackedTag.asBoolean(), lodestonePosTag, lodestoneDimension, data);
         }
 
         final ListTag<CompoundTag> effectsTag = tag.getListTag("effects", CompoundTag.class);
@@ -1047,12 +1048,14 @@ private void updateEffects(final ListTag<CompoundTag> effects, final StructuredD
         data.set(StructuredDataKey.SUSPICIOUS_STEW_EFFECTS, suspiciousStewEffects);
     }
 
-    private void updateLodestoneTracker(final CompoundTag tag, final CompoundTag lodestonePosTag, final String lodestoneDimensionTag, final StructuredDataContainer data) {
-        final boolean tracked = tag.getBoolean("LodestoneTracked");
-        final int x = lodestonePosTag.getInt("X");
-        final int y = lodestonePosTag.getInt("Y");
-        final int z = lodestonePosTag.getInt("Z");
-        final GlobalPosition position = new GlobalPosition(lodestoneDimensionTag, x, y, z);
+    private void updateLodestoneTracker(final boolean tracked, final CompoundTag lodestonePosTag, final String lodestoneDimensionTag, final StructuredDataContainer data) {
+        GlobalPosition position = null;
+        if (lodestonePosTag != null && lodestoneDimensionTag != null) {
+            final int x = lodestonePosTag.getInt("X");
+            final int y = lodestonePosTag.getInt("Y");
+            final int z = lodestonePosTag.getInt("Z");
+            position = new GlobalPosition(lodestoneDimensionTag, x, y, z);
+        }
         data.set(StructuredDataKey.LODESTONE_TRACKER, new LodestoneTracker(position, tracked));
     }
 

diff --git a/...com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java b/...com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java
@@ -220,13 +220,15 @@ public StructuredDataConverter(final boolean backupInconvertibleData) {
         register(StructuredDataKey.CHARGED_PROJECTILES, (connection, data, tag) -> convertItemList(connection, data, tag, "ChargedProjectiles"));
         register(StructuredDataKey.BUNDLE_CONTENTS, (connection, data, tag) -> convertItemList(connection, data, tag, "Items"));
         register(StructuredDataKey.LODESTONE_TRACKER, (data, tag) -> {
-            final CompoundTag positionTag = new CompoundTag();
-            tag.put("LodestonePos", positionTag);
             tag.putBoolean("LodestoneTracked", data.tracked());
-            tag.putString("LodestoneDimension", data.position().dimension());
-            positionTag.putInt("X", data.position().x());
-            positionTag.putInt("Y", data.position().y());
-            positionTag.putInt("Z", data.position().z());
+            if (data.position() != null) {
+                final CompoundTag positionTag = new CompoundTag();
+                positionTag.putInt("X", data.position().x());
+                positionTag.putInt("Y", data.position().y());
+                positionTag.putInt("Z", data.position().z());
+                tag.put("LodestonePos", positionTag);
+                tag.putString("LodestoneDimension", data.position().dimension());
+            }
         });
         register(StructuredDataKey.FIREWORKS, (data, tag) -> {
             final CompoundTag fireworksTag = new CompoundTag();