Release 1.22.0

pom.xml

@@ -57,14 +57,14 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.9</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>2.3.0-SNAPSHOT</bentobox.version>
+        <spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>2.4.1-SNAPSHOT</bentobox.version>
         <!-- 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>1.21.0</build.version>
+        <build.version>1.22.0</build.version>
         <sonar.projectKey>BentoBoxWorld_Limits</sonar.projectKey>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

src/main/java/world/bentobox/limits/Limits.java

@@ -1,14 +1,15 @@
 package world.bentobox.limits;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.bukkit.Material;
 import org.bukkit.World;
-
 import org.bukkit.entity.EntityType;
 import org.eclipse.jdt.annotation.Nullable;
+
 import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.user.User;
@@ -30,7 +31,7 @@ public class Limits extends Addon {
 
     private static final String LIMIT_NOT_SET = "Limit not set";
     private Settings settings;
-    private List<GameModeAddon> gameModes;
+    private List<GameModeAddon> gameModes = new ArrayList<>();
     private BlockLimitsListener blockLimitListener;
     private JoinListener joinListener;
 
@@ -109,9 +110,9 @@ public String getGameModeName(World world) {
     }
 
     /**
-     * Get the name of the game mode for this world
+     * Get the permission prefix for this world
      * @param world - world
-     * @return game mode name or empty string if none
+     * @return permisdsion prefix or empty string if none
      */
     public String getGameModePermPrefix(World world) {
         return gameModes.stream().filter(gm -> gm.inWorld(world)).findFirst().map(GameModeAddon::getPermissionPrefix).orElse("");

src/main/java/world/bentobox/limits/LimitsPladdon.java

@@ -7,8 +7,13 @@
 
 public class LimitsPladdon extends Pladdon {
 
+    private Addon addon;
+
     @Override
     public Addon getAddon() {
-        return new Limits();
+        if (addon == null) {
+            addon = new Limits();
+        }
+        return addon;
     }
 }

src/main/java/world/bentobox/limits/Settings.java

@@ -13,15 +13,15 @@ public class Settings {
     private final List<String> gameModes;
     private final boolean asyncGolums;
     private static final List<EntityType> DISALLOWED = Arrays.asList(
-            EntityType.PRIMED_TNT,
+            EntityType.TNT,
             EntityType.EVOKER_FANGS,
             EntityType.LLAMA_SPIT,
             EntityType.DRAGON_FIREBALL,
             EntityType.AREA_EFFECT_CLOUD,
-            EntityType.ENDER_SIGNAL,
+            EntityType.END_CRYSTAL,
             EntityType.SMALL_FIREBALL,
             EntityType.FIREBALL,
-            EntityType.THROWN_EXP_BOTTLE,
+            EntityType.EXPERIENCE_BOTTLE,
             EntityType.EXPERIENCE_ORB,
             EntityType.SHULKER_BULLET,
             EntityType.WITHER_SKULL,
@@ -30,9 +30,8 @@ public class Settings {
             EntityType.SPECTRAL_ARROW,
             EntityType.SNOWBALL,
             EntityType.EGG,
-            EntityType.LEASH_HITCH,
+            EntityType.LEASH_KNOT,
             EntityType.GIANT,
-            EntityType.ENDER_CRYSTAL,
             EntityType.ENDER_PEARL,
             EntityType.ENDER_DRAGON,
             EntityType.ITEM_FRAME,

src/main/java/world/bentobox/limits/commands/player/LimitTab.java

@@ -35,8 +35,7 @@ enum SORT_BY {
     // This maps the entity types to the icon that should be shown in the panel
     // If the icon is null, then the entity type is not covered by the addon
     private static final Map<EntityType, Material> E2M = ImmutableMap.<EntityType, Material>builder()
-            .put(EntityType.MUSHROOM_COW, Material.MOOSHROOM_SPAWN_EGG)
-            .put(EntityType.SNOWMAN, Material.SNOW_BLOCK)
+            .put(EntityType.MOOSHROOM, Material.MOOSHROOM_SPAWN_EGG).put(EntityType.SNOW_GOLEM, Material.SNOW_BLOCK)
             .put(EntityType.IRON_GOLEM, Material.IRON_BLOCK)
             .put(EntityType.ILLUSIONER, Material.VILLAGER_SPAWN_EGG)
             .put(EntityType.WITHER, Material.WITHER_SKELETON_SKULL)
@@ -45,21 +44,22 @@ enum SORT_BY {
             .put(EntityType.ITEM_FRAME, Material.ITEM_FRAME)
             .put(EntityType.PAINTING, Material.PAINTING)
             // Minecarts
-            .put(EntityType.MINECART_TNT, Material.TNT_MINECART)
-            .put(EntityType.MINECART_CHEST, Material.CHEST_MINECART)
-            .put(EntityType.MINECART_COMMAND, Material.COMMAND_BLOCK_MINECART)
-            .put(EntityType.MINECART_FURNACE, Material.FURNACE_MINECART)
-            .put(EntityType.MINECART_HOPPER, Material.HOPPER_MINECART)
-            .put(EntityType.MINECART_MOB_SPAWNER, Material.MINECART)
+            .put(EntityType.TNT_MINECART, Material.TNT_MINECART).put(EntityType.CHEST_MINECART, Material.CHEST_MINECART)
+            .put(EntityType.COMMAND_BLOCK_MINECART, Material.COMMAND_BLOCK_MINECART)
+            .put(EntityType.FURNACE_MINECART, Material.FURNACE_MINECART)
+            .put(EntityType.HOPPER_MINECART, Material.HOPPER_MINECART)
+            .put(EntityType.SPAWNER_MINECART, Material.MINECART)
+            .put(EntityType.CHEST_BOAT, Material.OAK_CHEST_BOAT)
             .build();
-    // This is a map of blocks to Material
+    // This is a map of blocks to Items
     private static final Map<Material, Material> B2M;
     static {
         ImmutableMap.Builder<Material, Material> builder = ImmutableMap.<Material, Material>builder()
                 .put(Material.POTATOES, Material.POTATO)
                 .put(Material.CARROTS, Material.CARROT)
                 .put(Material.BEETROOTS, Material.BEETROOT)
-                .put(Material.REDSTONE_WIRE, Material.REDSTONE);
+                .put(Material.REDSTONE_WIRE, Material.REDSTONE).put(Material.MELON_STEM, Material.MELON)
+                .put(Material.PUMPKIN_STEM, Material.PUMPKIN);
         // Block to Material icons
         Optional.ofNullable(Material.getMaterial("SWEET_BERRY_BUSH")).ifPresent(material -> builder.put(material, Objects.requireNonNull(Material.getMaterial("SWEET_BERRIES"))));
         Optional.ofNullable(Material.getMaterial("BAMBOO_SAPLING")).ifPresent(material -> builder.put(material, Objects.requireNonNull(Material.getMaterial("BAMBOO"))));

src/main/java/world/bentobox/limits/listeners/EntityLimitListener.java

@@ -172,6 +172,7 @@ private boolean checkLimit(Cancellable c, LivingEntity e, SpawnReason reason, bo
 
     private boolean processIsland(Cancellable c, LivingEntity e, Location l, SpawnReason reason, boolean async) {
         if (addon.getIslands().getIslandAt(e.getLocation()).isEmpty()) {
+            c.setCancelled(false);
             return true;
         }
         Island island = addon.getIslands().getIslandAt(e.getLocation()).get();
@@ -225,7 +226,7 @@ private void detectIronGolem(Location l) {
             if (body.getType().equals(Material.IRON_BLOCK)) {
                 // Check for head
                 Block head = body.getRelative(bf);
-                if (head.getType().equals(Material.CARVED_PUMPKIN)) {
+                if (head.getType() == Material.CARVED_PUMPKIN || head.getType() == Material.JACK_O_LANTERN) {
                     // Check for arms the rule is that they must be opposite and have nothing "beneath" them
                     for (BlockFace bf2 : CARDINALS) {
                         Block arm1 = body.getRelative(bf2);