Skip to content

Fix "Unregistered holder" exception when applying an ArchetypeVolume to a world #4237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: api-12
Choose a base branch
from
Open

Fix "Unregistered holder" exception when applying an ArchetypeVolume to a world #4237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/org/spongepowered/common/world/volume/VolumeStreamUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import net.minecraft.core.SectionPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Tuple;
import net.minecraft.world.entity.Entity;
Expand Down Expand Up @@ -60,6 +61,7 @@
import org.spongepowered.api.world.volume.stream.StreamOptions;
import org.spongepowered.api.world.volume.stream.VolumeElement;
import org.spongepowered.api.world.volume.stream.VolumeStream;
import org.spongepowered.common.SpongeCommon;
import org.spongepowered.common.accessor.client.multiplayer.ClientLevelAccessor;
import org.spongepowered.common.accessor.server.level.ServerLevelAccessor;
import org.spongepowered.common.accessor.world.level.block.entity.BlockEntityAccessor;
Expand Down Expand Up @@ -177,7 +179,11 @@ public static boolean setBiomeOnNativeChunk(final int x, final int y, final int
final int maskedX = x & 3;
final int maskedY = y & 3;
final int maskedZ = z & 3;
final var old = ((PalettedContainer<Holder<Biome>>) section.getBiomes()).getAndSet(maskedX, maskedY, maskedZ, Holder.direct((Biome) (Object) biome));
final Registry<Biome> biomeRegistry = SpongeCommon.vanillaRegistry(Registries.BIOME);
final ResourceKey<Biome> biomeResourceKey = biomeRegistry.getResourceKey((Biome) (Object) biome)
.orElseThrow(() -> new IllegalStateException("Missing resource in " + biomeRegistry.key() + ": " + biome));
final Holder.Reference<Biome> biomeHolder = biomeRegistry.getHolderOrThrow(biomeResourceKey);
final var old = ((PalettedContainer<Holder<Biome>>) section.getBiomes()).getAndSet(maskedX, maskedY, maskedZ, biomeHolder);
if (old.value() == (Object) biome) {
return false;
}
Expand Down