From bae1b650fc3c8cce2f825bda0d91d3e0df1d6417 Mon Sep 17 00:00:00 2001 From: Octavia Togami <octavia.togami@gmail.com> Date: Wed, 16 Oct 2024 07:28:35 -0700 Subject: [PATCH] Directly access the data version from MC Spigot recently made a breaking change to CraftMagicNumbers which breaks this code, by using MC directly we avoid this issue ever occuring in the future --- .../bukkit/adapter/impl/v1_21/PaperweightAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-1.21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightAdapter.java index dc5de03d42..25cbc8d47b 100644 --- a/worldedit-bukkit/adapters/adapter-1.21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightAdapter.java @@ -68,6 +68,7 @@ import com.sk89q.worldedit.world.generation.ConfiguredFeatureType; import com.sk89q.worldedit.world.generation.StructureType; import com.sk89q.worldedit.world.item.ItemType; +import net.minecraft.SharedConstants; import net.minecraft.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; @@ -146,7 +147,6 @@ import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.inventory.CraftItemStack; -import org.bukkit.craftbukkit.util.CraftMagicNumbers; import org.bukkit.entity.Player; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.generator.ChunkGenerator; @@ -216,7 +216,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { // A simple test CraftServer.class.cast(Bukkit.getServer()); - int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion(); + int dataVersion = SharedConstants.getCurrentVersion().getDataVersion().getVersion(); if (dataVersion != 3953 && dataVersion != 3955) { throw new UnsupportedClassVersionError("Not 1.21(.1)!"); } @@ -235,7 +235,7 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException { ); chunkProviderExecutorField.setAccessible(true); - this.dataFixer = new PaperweightDataConverters(CraftMagicNumbers.INSTANCE.getDataVersion(), this); + this.dataFixer = new PaperweightDataConverters(dataVersion, this); Watchdog watchdog; try {