Remove no longer needed legacy serlizazion

PaperMC · Aug 16, 2024 · 14aa072 · 14aa072
1 parent 4c0e8a0
commit 14aa072
Showing 1 changed file with 5 additions and 28 deletions.
diff --git a/patches/server/0169-Add-ArmorStand-Item-Meta.patch b/patches/server/0169-Add-ArmorStand-Item-Meta.patch
@@ -33,7 +33,7 @@ index eef3517833ff5c0cf41b89973ebc972b8ed31e0f..c9fbc01be0b0e7fd1cafb091d06496f4
              (type, meta) -> meta instanceof CraftMetaArmorStand armorStand ? armorStand : new CraftMetaArmorStand(meta));
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..b675326f6a4572c60f20efab01f577804eda9221 100644
+index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..ecce5d0da946ca279c5608068442cc53437dd2a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -11,9 +11,17 @@ import org.bukkit.Material;
@@ -68,7 +68,7 @@ index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..b675326f6a4572c60f20efab01f57780
 +            } catch (java.io.IOException ex) {
 +                java.util.logging.Logger.getLogger(CraftMetaItem.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
 +            }
-+            // Fallthrough here to prioritize legacy fields in the map. Should generally be none.
++            return;
 +        }
 +        SerializableMeta.getObjectOptionally(Boolean.class, map, INVISIBLE.BUKKIT, true).ifPresent((value) -> {
 +            populateTagIfNull();
@@ -109,7 +109,7 @@ index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..b675326f6a4572c60f20efab01f57780
      @Override
      void serializeInternal(Map<String, Tag> internalTags) {
 -        if (this.entityTag != null && !this.entityTag.isEmpty()) {
-+        if (this.entityTag != null && !this.entityTag.isEmpty() && false) { // Paper - now correctly serialised as entity tag
++        if (false && this.entityTag != null && !this.entityTag.isEmpty()) { // Paper - now correctly serialised as entity tag
              internalTags.put(CraftMetaArmorStand.ENTITY_TAG.NBT, this.entityTag);
          }
      }
@@ -133,7 +133,7 @@ index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..b675326f6a4572c60f20efab01f57780
          }
          return true;
      }
-@@ -112,6 +159,44 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -112,6 +159,21 @@ public class CraftMetaArmorStand extends CraftMetaItem {
      Builder<String, Object> serialize(Builder<String, Object> builder) {
          super.serialize(builder);
 
@@ -150,35 +150,12 @@ index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..b675326f6a4572c60f20efab01f57780
 +            builder.put(ENTITY_TAG.BUKKIT, java.util.Base64.getEncoder().encodeToString(buf.toByteArray()));
 +            return builder;
 +        }
-+
-+        if (this.entityTag.get(CraftMetaArmorStand.ENTITY_ID.NBT) != null) {
-+            builder.put(ENTITY_ID.BUKKIT, this.entityTag.getString(CraftMetaArmorStand.ENTITY_ID.NBT));
-+        }
-+        if (this.entityTag.get(CraftMetaArmorStand.INVISIBLE.NBT) != null) {
-+            builder.put(INVISIBLE.BUKKIT, this.entityTag.getBoolean(CraftMetaArmorStand.INVISIBLE.NBT));
-+        }
-+
-+        if (this.entityTag.get(CraftMetaArmorStand.NO_BASE_PLATE.NBT) != null) {
-+            builder.put(NO_BASE_PLATE.BUKKIT, this.entityTag.getBoolean(CraftMetaArmorStand.NO_BASE_PLATE.NBT));
-+        }
-+
-+        if (this.entityTag.get(CraftMetaArmorStand.SHOW_ARMS.NBT) != null) {
-+            builder.put(SHOW_ARMS.BUKKIT, this.entityTag.getBoolean(CraftMetaArmorStand.SHOW_ARMS.NBT));
-+        }
-+
-+        if (this.entityTag.get(CraftMetaArmorStand.SMALL.NBT) != null) {
-+            builder.put(SMALL.BUKKIT, this.entityTag.getBoolean(CraftMetaArmorStand.SMALL.NBT));
-+        }
-+
-+        if (this.entityTag.get(CraftMetaArmorStand.MARKER.NBT) != null) {
-+            builder.put(MARKER.BUKKIT, this.entityTag.getBoolean(CraftMetaArmorStand.MARKER.NBT));
-+        }
 +        // Paper end
 +
          return builder;
      }
 
-@@ -125,4 +210,68 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+@@ -125,4 +187,68 @@ public class CraftMetaArmorStand extends CraftMetaItem {
 
          return clone;
      }