From de267a8251af343e639012d55ea6bd9e42967f79 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 20 Nov 2021 22:34:40 -0700 Subject: [PATCH] fix BinaryColumn --- .../feature/locator/config/SurfaceLocatorTemplate.java | 2 +- .../addons/feature/locator/locators/SurfaceLocator.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java index 146bdda47..209e54b46 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java @@ -29,6 +29,6 @@ public class SurfaceLocatorTemplate implements ObjectTemplate { @Override public Locator get() { - return new SurfaceLocator(range, platform); + return new SurfaceLocator(range); } } diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java index f2decca21..6e244f55f 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java @@ -18,20 +18,16 @@ import com.dfsek.terra.api.world.Column; public class SurfaceLocator implements Locator { private final Range search; - private final BlockState air; - - public SurfaceLocator(Range search, Platform platform) { + public SurfaceLocator(Range search) { this.search = search; - this.air = platform.getWorldHandle().air(); } @Override public BinaryColumn getSuitableCoordinates(Column column) { BinaryColumn location = new BinaryColumn(column.getMinY(), column.getMaxY()); for(int y : search) { - if(column.getBlock(y).matches(air) && !column.getBlock(y - 1).matches(air)) { + if(column.getBlock(y).isAir() && !column.getBlock(y - 1).isAir()) { location.set(y); - return location; } } return location;