diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java index f6214d571..04164a821 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorld.java @@ -38,6 +38,7 @@ import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.fabric.internal.ExtendedMinecraftServer; import com.sk89q.worldedit.fabric.internal.FabricWorldNativeAccess; import com.sk89q.worldedit.fabric.internal.NBTConverter; +import com.sk89q.worldedit.fabric.mixin.AccessorDerivedLevelData; import com.sk89q.worldedit.fabric.mixin.AccessorPrimaryLevelData; import com.sk89q.worldedit.fabric.mixin.AccessorServerChunkCache; import com.sk89q.worldedit.internal.Constants; @@ -316,8 +317,12 @@ public class FabricWorld extends AbstractWorld { LevelStorageSource levelStorage = LevelStorageSource.createDefault(tempDir); try (LevelStorageSource.LevelStorageAccess session = levelStorage.createAccess("WorldEditTempGen")) { ServerLevel originalWorld = (ServerLevel) getWorld(); - AccessorPrimaryLevelData levelProperties = (AccessorPrimaryLevelData) - originalWorld.getLevelData(); + AccessorPrimaryLevelData levelProperties; + if (originalWorld.getLevelData() instanceof AccessorDerivedLevelData derivedLevelData) { + levelProperties = (AccessorPrimaryLevelData) derivedLevelData.getWrapped(); + } else { + levelProperties = (AccessorPrimaryLevelData) originalWorld.getLevelData(); + } WorldGenSettings originalOpts = levelProperties.worldGenSettings(); long seed = options.getSeed().orElse(originalWorld.getSeed()); diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorDerivedLevelData.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorDerivedLevelData.java new file mode 100644 index 000000000..8af17bc61 --- /dev/null +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorDerivedLevelData.java @@ -0,0 +1,32 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.fabric.mixin; + +import net.minecraft.world.level.storage.DerivedLevelData; +import net.minecraft.world.level.storage.ServerLevelData; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(DerivedLevelData.class) +public interface AccessorDerivedLevelData extends ServerLevelData { + + @Accessor + ServerLevelData getWrapped(); +} diff --git a/worldedit-fabric/src/main/resources/worldedit.mixins.json b/worldedit-fabric/src/main/resources/worldedit.mixins.json index 37f3c7809..076670106 100644 --- a/worldedit-fabric/src/main/resources/worldedit.mixins.json +++ b/worldedit-fabric/src/main/resources/worldedit.mixins.json @@ -5,6 +5,7 @@ "mixins": [ "AccessorClientboundBlockEntityDataPacket", "AccessorPrimaryLevelData", + "AccessorDerivedLevelData", "AccessorServerChunkCache", "MixinLevelChunkSetBlockHook", "MixinMinecraftServer",