diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java index bd12858eb..2a7af851f 100644 --- a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightFaweAdapter.java @@ -608,11 +608,22 @@ public final class PaperweightFaweAdapter extends CachedBukkitAdapter implements @Override public int getInternalBiomeId(BiomeType biomeType) { - Biome biomeBase = CraftBlock.biomeToBiomeBase( - MinecraftServer.getServer().registryAccess().ownedRegistryOrThrow(Registry.BIOME_REGISTRY), - BukkitAdapter.adapt(biomeType) - ); - return MinecraftServer.getServer().registryAccess().ownedRegistryOrThrow(Registry.BIOME_REGISTRY).getId(biomeBase); + if (biomeType.getId().startsWith("minecraft:")) { + Biome biomeBase = CraftBlock.biomeToBiomeBase( + MinecraftServer.getServer().registryAccess().ownedRegistryOrThrow(Registry.BIOME_REGISTRY), + BukkitAdapter.adapt(biomeType) + ); + return MinecraftServer.getServer().registryAccess().ownedRegistryOrThrow(Registry.BIOME_REGISTRY).getId(biomeBase); + } else { + WritableRegistry biomeRegistry = MinecraftServer.getServer().registryAccess() + .ownedRegistryOrThrow(Registry.BIOME_REGISTRY); + + ResourceLocation resourceLocation = biomeRegistry.keySet().stream() + .filter(resource -> resource.toString().equals(biomeType.getId())) + .findAny().orElse(null); + + return biomeRegistry.getId(biomeRegistry.get(resourceLocation)); + } } @Override diff --git a/worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar b/worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar index 26f40c5ec..77937fd88 100644 Binary files a/worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar and b/worldedit-bukkit/adapters/adapter-legacy/src/main/resources/worldedit-adapters.jar differ