Work around a Spigot breakage. Fixes #2450

EngineHub · Dec 19, 2023 · 6e820d4 · 6e820d4
1 parent fa5cf21
commit 6e820d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/....2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java b/....2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightAdapter.java
@@ -1000,8 +1000,8 @@ LinTag<?> toNative(net.minecraft.nbt.Tag foreign) {
         }
         if (foreign instanceof net.minecraft.nbt.CompoundTag compoundTag) {
             LinCompoundTag.Builder builder = LinCompoundTag.builder();
-            for (var entry : compoundTag.tags.entrySet()) {
-                builder.put(entry.getKey(), toNative(entry.getValue()));
+            for (var entry : compoundTag.getAllKeys()) {
+                builder.put(entry, toNative(compoundTag.get(entry)));
             }
             return builder.build();
         } else if (foreign instanceof net.minecraft.nbt.ByteTag byteTag) {

diff --git a/....4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java b/....4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightAdapter.java
@@ -999,8 +999,8 @@ LinTag<?> toNative(net.minecraft.nbt.Tag foreign) {
         }
         if (foreign instanceof net.minecraft.nbt.CompoundTag compoundTag) {
             LinCompoundTag.Builder builder = LinCompoundTag.builder();
-            for (var entry : compoundTag.tags.entrySet()) {
-                builder.put(entry.getKey(), toNative(entry.getValue()));
+            for (var entry : compoundTag.getAllKeys()) {
+                builder.put(entry, toNative(compoundTag.get(entry)));
             }
             return builder.build();
         } else if (foreign instanceof net.minecraft.nbt.ByteTag byteTag) {

diff --git a/...20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java b/...20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R1/PaperweightAdapter.java
@@ -1000,8 +1000,8 @@ LinTag<?> toNative(net.minecraft.nbt.Tag foreign) {
         }
         if (foreign instanceof net.minecraft.nbt.CompoundTag compoundTag) {
             LinCompoundTag.Builder builder = LinCompoundTag.builder();
-            for (var entry : compoundTag.tags.entrySet()) {
-                builder.put(entry.getKey(), toNative(entry.getValue()));
+            for (var entry : compoundTag.getAllKeys()) {
+                builder.put(entry, toNative(compoundTag.get(entry)));
             }
             return builder.build();
         } else if (foreign instanceof net.minecraft.nbt.ByteTag byteTag) {