From f6305378979a83ee52845a612e65c3b268cc90fb Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Wed, 21 Jul 2021 11:27:21 +0200 Subject: [PATCH] ANY treetype --- src/main/java/com/volmit/iris/core/TreeManager.java | 2 +- src/main/java/com/volmit/iris/engine/object/IrisTreeType.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/TreeManager.java b/src/main/java/com/volmit/iris/core/TreeManager.java index 9cc4e4faa..821edd00b 100644 --- a/src/main/java/com/volmit/iris/core/TreeManager.java +++ b/src/main/java/com/volmit/iris/core/TreeManager.java @@ -210,7 +210,7 @@ public class TreeManager implements Listener { .filter(objectPlacement -> objectPlacement.getTreeOptions().isEnabled()) .filter(objectPlacement -> objectPlacement.getTreeOptions().getTrees().stream().anyMatch(irisTree -> irisTree.getSizes().stream().anyMatch(treeSize -> treeSize == IrisTreeSize.ANY || treeSize == size) && - irisTree.getTreeTypes().stream().anyMatch(treeType -> treeType == type))) + irisTree.getTreeTypes().stream().anyMatch(treeType -> treeType == IrisTreeType.ANY || treeType == type))) .forEach(objectPlacements::add); return objectPlacements; } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisTreeType.java b/src/main/java/com/volmit/iris/engine/object/IrisTreeType.java index df8728281..1b34941a4 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisTreeType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisTreeType.java @@ -43,6 +43,9 @@ public enum IrisTreeType { @Desc("Tree with large roots which grows above lush caves") AZALEA, + @Desc("Any tree type (all will match, including mushrooms & nether trees") + ANY, + @Desc("The fallback type for all other non-supported growth events") NONE;