From 9e51a1617f0bf60666081230f91302ddc2d68bc5 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 13 Sep 2020 08:57:13 -0400 Subject: [PATCH] Ugh --- .../volmit/iris/object/IrisObjectReplace.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java index c4c3e8990..4689b4603 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java @@ -5,7 +5,6 @@ import org.bukkit.block.data.BlockData; import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.noise.CNG; import com.volmit.iris.util.ArrayType; -import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; import com.volmit.iris.util.KList; @@ -24,11 +23,11 @@ import lombok.experimental.Accessors; @Data public class IrisObjectReplace { - @ArrayType(min = 1, type = String.class) + @ArrayType(min = 1, type = IrisBlockData.class) @Required @Desc("Find this block") @DontObfuscate - private KList find = new KList<>(); + private KList find = new KList<>(); @Required @Desc("Replace it with this block palette") @@ -45,7 +44,22 @@ public class IrisObjectReplace public KList getFind() { - return findData.aquire(() -> B.getBlockData(find)); + return findData.aquire(() -> + { + KList b = new KList<>(); + + for(IrisBlockData i : find) + { + BlockData bx = i.getBlockData(); + + if(bx != null) + { + b.add(bx); + } + } + + return b; + }); } public BlockData getReplace(RNG seed, double x, double y, double z)