From 024176f97c929849cf4644447048f8f1f00a914c Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 12 Mar 2024 21:15:15 -0500 Subject: [PATCH] Fix migrated downsampling light looking weird --- .../fullData/sources/NewFullDataSource.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/NewFullDataSource.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/NewFullDataSource.java index 53091e49c..588c0776b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/NewFullDataSource.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/NewFullDataSource.java @@ -177,18 +177,21 @@ public class NewFullDataSource implements IDataSource byte blockLight = (byte) FullDataPointUtilV1.getBlockLight(dataPoint); byte skyLight = (byte) FullDataPointUtilV1.getSkyLight(dataPoint); + IBlockStateWrapper blockState = legacyData.getMapping().getBlockStateWrapper(id); + if (blockState.isAir()) + { + // air shouldn't have any light, otherwise down sampling will look weird + blockLight = 0; + } + long newDataPoint = FullDataPointUtil.encode(id, height, bottomY, blockLight, skyLight); dataColumn[i] = newDataPoint; // check if this datapoint is air - if (!columnHasNonAirBlock) + if (!columnHasNonAirBlock && !blockState.isAir()) { - IBlockStateWrapper blockState = legacyData.getMapping().getBlockStateWrapper(id); - if (!blockState.isAir()) - { - columnHasNonAirBlock = true; - } + columnHasNonAirBlock = true; } }