Skip to content

Commit

Permalink
Directly access the data version from MC
Browse files Browse the repository at this point in the history
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
  • Loading branch information
octylFractal committed Oct 16, 2024
1 parent 31a795a commit bae1b65
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)!");
}
Expand All @@ -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 {
Expand Down

0 comments on commit bae1b65

Please sign in to comment.