From cca1daf99f87de2b40db3c1d52bd9a294ca008d3 Mon Sep 17 00:00:00 2001 From: Steven Van Ingelgem Date: Wed, 4 Sep 2024 14:29:57 +0200 Subject: [PATCH] I saw bees didn't behave. Bees are animals. When animals are disabled, they still popped up. So bad bad bees! (#138) Fixed that. --- .../coregen/populatordata/PopulatorDataSpigotAPI.java | 2 ++ .../main/java/org/terraform/utils/version/BeeHiveSpawner.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/common/src/main/java/org/terraform/coregen/populatordata/PopulatorDataSpigotAPI.java b/common/src/main/java/org/terraform/coregen/populatordata/PopulatorDataSpigotAPI.java index 6f4ee74d..19370ac3 100644 --- a/common/src/main/java/org/terraform/coregen/populatordata/PopulatorDataSpigotAPI.java +++ b/common/src/main/java/org/terraform/coregen/populatordata/PopulatorDataSpigotAPI.java @@ -130,6 +130,8 @@ public TerraformWorld getTerraformWorld() { @Override public void setBeehiveWithBee(int rawX, int rawY, int rawZ) { + if (!TConfig.areAnimalsEnabled()) return; + if (!lr.isInRegion(rawX, rawY, rawZ)) { return; // just forget it } diff --git a/common/src/main/java/org/terraform/utils/version/BeeHiveSpawner.java b/common/src/main/java/org/terraform/utils/version/BeeHiveSpawner.java index 0fc3342b..70a6333b 100644 --- a/common/src/main/java/org/terraform/utils/version/BeeHiveSpawner.java +++ b/common/src/main/java/org/terraform/utils/version/BeeHiveSpawner.java @@ -6,10 +6,13 @@ import org.terraform.coregen.populatordata.IPopulatorDataBeehiveEditor; import org.terraform.data.SimpleBlock; import org.terraform.main.TerraformGeneratorPlugin; +import org.terraform.main.config.TConfig; public class BeeHiveSpawner { public static void spawnFullBeeNest(@NotNull SimpleBlock block) { + if (!TConfig.areAnimalsEnabled()) return; + try { if (block.getPopData() instanceof IPopulatorDataBeehiveEditor ipopdata) { ipopdata.setBeehiveWithBee(block.getX(), block.getY(), block.getZ());