From 80ede42191ddee842042f86d9c17a71a5a82ff89 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 17 Jul 2021 18:01:11 +0200 Subject: [PATCH] Remove toggle from biome/region sapling config & prevent non-iris world --- .../java/com/volmit/iris/core/SaplingManager.java | 12 ++++++------ .../com/volmit/iris/engine/object/IrisBiome.java | 3 --- .../com/volmit/iris/engine/object/IrisRegion.java | 3 --- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/SaplingManager.java b/src/main/java/com/volmit/iris/core/SaplingManager.java index 3fc5f90f5..a4f781c4d 100644 --- a/src/main/java/com/volmit/iris/core/SaplingManager.java +++ b/src/main/java/com/volmit/iris/core/SaplingManager.java @@ -1,6 +1,8 @@ package com.volmit.iris.core; import com.volmit.iris.Iris; +import com.volmit.iris.engine.IrisWorldManager; +import com.volmit.iris.engine.IrisWorlds; import org.bukkit.TreeType; import org.bukkit.block.data.type.Sapling; import org.bukkit.event.EventHandler; @@ -18,12 +20,10 @@ public class SaplingManager implements Listener { @EventHandler public void onStructureGrowEvent(StructureGrowEvent event) { - if (event.getSpecies() == TreeType.JUNGLE) - Iris.info("Sapling grew @ " + event.getLocation() + " for " + event.getSpecies().name() + " bonemealed is " + event.isFromBonemeal() + " by player " + Objects.requireNonNull(event.getPlayer()).getName()); - } + if (!IrisWorlds.isIrisWorld(event.getWorld())) return; + + // TODO: Remove this line + Iris.info("Sapling grew @ " + event.getLocation() + " for " + event.getSpecies().name() + " bonemealed is " + event.isFromBonemeal() + " by player " + Objects.requireNonNull(event.getPlayer()).getName()); - @EventHandler - public void onBlockPlaceEvent(BlockPlaceEvent event) { - Iris.info("Placed " + event.getBlock().getBlockData().getMaterial().name() + " @ " + event.getBlock().getLocation()); } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java index 5140895ec..fb3baadca 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -84,9 +84,6 @@ public class IrisBiome extends IrisRegistrant implements IRare { @Desc("Sapling override settings") private IrisSaplings saplings = new IrisSaplings(); - @Desc("Enable sapling overrides") - private boolean useSaplings = false; - @ArrayType(min = 1, type = IrisEffect.class) @Desc("Effects are ambient effects such as potion effects, random sounds, or even particles around each player. All of these effects are played via packets so two players won't see/hear each others effects.\nDue to performance reasons, effects will play arround the player even if where the effect was played is no longer in the biome the player is in.") private KList effects = new KList<>(); diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java index cbef49407..f821a9be7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -82,9 +82,6 @@ public class IrisRegion extends IrisRegistrant implements IRare { @Desc("Sapling override settings") private IrisSaplings saplings = new IrisSaplings(); - @Desc("Enable sapling overrides") - private boolean useSaplings = false; - @MinNumber(1) @MaxNumber(128) @Desc("The rarity of the region")