From 28d3f2d74200145821a693c3a4857279047194a6 Mon Sep 17 00:00:00 2001
From: Dragon-Seeker <timekeeperguild@gmail.com>
Date: Mon, 11 Nov 2024 17:07:01 -0600
Subject: [PATCH] Adjust NbtSerializer to prevent issues with equality and
 hashcode

---
 .../owo/serialization/format/nbt/NbtSerializer.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/wispforest/owo/serialization/format/nbt/NbtSerializer.java b/src/main/java/io/wispforest/owo/serialization/format/nbt/NbtSerializer.java
index 6fe8877a..81524d01 100644
--- a/src/main/java/io/wispforest/owo/serialization/format/nbt/NbtSerializer.java
+++ b/src/main/java/io/wispforest/owo/serialization/format/nbt/NbtSerializer.java
@@ -101,7 +101,7 @@ public void writeBytes(SerializationContext ctx, byte[] bytes) {
         this.consume(new NbtByteArray(bytes));
     }
 
-    private final Set<NbtElement> encodedOptionals = Collections.newSetFromMap(new WeakHashMap<>());
+    private final Set<IdentityHolder<NbtElement>> encodedOptionals = Collections.newSetFromMap(new WeakHashMap<>());
 
     @Override
     public <V> void writeOptional(SerializationContext ctx, Endec<V> endec, Optional<V> optional) {
@@ -115,7 +115,7 @@ public <V> void writeOptional(SerializationContext ctx, Endec<V> endec, Optional
 
             var compound = encoded.require("optional representation");
 
-            encodedOptionals.add(compound);
+            encodedOptionals.add(new IdentityHolder<>(compound));
             frameData.setValue(compound);
         });
 
@@ -177,7 +177,7 @@ public <F> Struct field(String name, SerializationContext ctx, Endec<F> endec, F
 
                 var element = encoded.require("struct field");
 
-                if (mayOmit && NbtSerializer.this.encodedOptionals.contains(element)) {
+                if (mayOmit && NbtSerializer.this.encodedOptionals.contains(new IdentityHolder<>(element))) {
                     var nbtCompound = (NbtCompound) element;
 
                     if(!nbtCompound.getBoolean("present")) return;