Back-port to 1.21.1 for #115

Author: bengibbs-afero

pom.xml

@@ -54,15 +54,15 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.21.7-R0.1-SNAPSHOT</spigot.version>
-        <paper.version>1.21.8-R0.1-SNAPSHOT</paper.version>
-        <bentobox.version>3.3.0</bentobox.version> <!-- Errors with later versions regarding kyori-->
+        <spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
+        <paper.version>1.21.1-R0.1-SNAPSHOT</paper.version>
+        <bentobox.version>3.7.0</bentobox.version> <!-- Errors with later versions regarding kyori-->
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>3.2.0</build.version>
+        <build.version>3.2.0-for-1.21.1-only</build.version>
 
         <sonar.projectKey>BentoBoxWorld_Boxed</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>

src/main/java/world/bentobox/boxed/generators/chunks/BoxedBlockPopulator.java

@@ -115,10 +115,16 @@ else if (bs instanceof Banner banner && bpBlock.getBannerPatterns() != null) {
     public void setSpawner(CreatureSpawner spawner, BlueprintCreatureSpawner s) {
         spawner.setSpawnedType(s.getSpawnedType());
         spawner.setMaxNearbyEntities(s.getMaxNearbyEntities());
-        spawner.setMaxSpawnDelay(s.getMaxSpawnDelay());
-        spawner.setMinSpawnDelay(s.getMinSpawnDelay());
+        int delay = Math.max(s.getMinSpawnDelay(), s.getMaxSpawnDelay());
+        if (delay < 1) {
+            delay = 120; // Set the default 2 minutes
+        }
+        spawner.setMaxSpawnDelay(delay);
+        delay = Math.max(s.getMinSpawnDelay(), 1);
+        spawner.setMinSpawnDelay(delay);
         spawner.setDelay(s.getDelay());
-        spawner.setRequiredPlayerRange(s.getRequiredPlayerRange());
+        int range = Math.max(s.getRequiredPlayerRange(), 0);
+        spawner.setRequiredPlayerRange(range);
         spawner.setSpawnRange(s.getSpawnRange());
         spawner.update(true, false);
     }