From 02498aa189712e687c0c0ca0c8dbc881b17cc8ef Mon Sep 17 00:00:00 2001 From: Steveplays28 Date: Wed, 16 Aug 2023 13:25:23 +0200 Subject: [PATCH] fix: Fix `index out of bounds` errors and LOD pillars The `BiomeWrapper#equals` and `BlockStateWrapper#equals` methods didn't use the right `LevelWrapper` for serializing the object to compare to, this is now fixed. --- .../distanthorizons/common/wrappers/block/BiomeWrapper.java | 2 +- .../common/wrappers/block/BlockStateWrapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index 3c8906565..3db25f462 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -115,7 +115,7 @@ public class BiomeWrapper implements IBiomeWrapper BiomeWrapper that = (BiomeWrapper) obj; // the serialized value is used so we can test the contents instead of the references - return Objects.equals(this.serialize(this.getLevelWrapper()), that.serialize(this.getLevelWrapper())); + return Objects.equals(this.serialize(this.getLevelWrapper()), that.serialize(that.getLevelWrapper())); } @Override diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index ab43c66eb..b9aa9c65d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -261,7 +261,7 @@ public class BlockStateWrapper implements IBlockStateWrapper BlockStateWrapper that = (BlockStateWrapper) obj; // the serialized value is used so we can test the contents instead of the references - return Objects.equals(this.serialize(this.getLevelWrapper()), that.serialize(this.getLevelWrapper())); + return Objects.equals(this.serialize(this.getLevelWrapper()), that.serialize(that.getLevelWrapper())); } @Override