From e613593f4135af50b0e2933b54dfeb2579fe794e Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 6 Sep 2019 12:58:40 -0300 Subject: [PATCH] biome fixer in structure spawner should use correct biome --- src/main/java/carpet/mixins/StructureFeatureMixin.java | 2 +- src/main/java/carpet/mixins/class_4548_getBiomeArrayMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/mixins/StructureFeatureMixin.java b/src/main/java/carpet/mixins/StructureFeatureMixin.java index 8e8f96c3..c57ad19b 100644 --- a/src/main/java/carpet/mixins/StructureFeatureMixin.java +++ b/src/main/java/carpet/mixins/StructureFeatureMixin.java @@ -115,7 +115,7 @@ public abstract class StructureFeatureMixin implements StructureFeatureInterface return structurestart; } } - Biome biome_1 = generator.getBiomeSource().getBiome(chunkpos.getStartX() + 9, 0, chunkpos.getStartZ() + 9); + Biome biome_1 = generator.getBiomeSource().getBiome((chunkpos.getStartX() + 9) >> 2, 0, (chunkpos.getStartZ() + 9) >> 2 ); StructureStart structurestart1 = getStructureStartFactory().create((StructureFeature)(Object)this, chunkpos.x, chunkpos.z, MutableIntBoundingBox.empty(),0,generator.getSeed()); structurestart1.initialize(generator, ((ServerWorld)worldIn).getStructureManager() , chunkpos.x, chunkpos.z, biome_1); structurestart = structurestart1.hasChildren() ? structurestart1 : StructureStart.DEFAULT; diff --git a/src/main/java/carpet/mixins/class_4548_getBiomeArrayMixin.java b/src/main/java/carpet/mixins/class_4548_getBiomeArrayMixin.java index 2f151d21..55edec62 100644 --- a/src/main/java/carpet/mixins/class_4548_getBiomeArrayMixin.java +++ b/src/main/java/carpet/mixins/class_4548_getBiomeArrayMixin.java @@ -29,6 +29,6 @@ public class class_4548_getBiomeArrayMixin implements class_4548Interface int int_4 = (pos.getX() >> 2) & field_20650; int int_5 = MathHelper.clamp(seaLevel, 0, field_20651); int int_6 = (pos.getZ() >> 2) & field_20650; - field_20654[int_5 << field_20652 + field_20652 | int_6 << field_20652 | int_4] = what; + field_20654[(int_5 << (field_20652 + field_20652)) | (int_6 << field_20652) | int_4] = what; } }