Merge branch 'harvest' into develop

BentoBoxWorld · Feb 15, 2021 · bf94e56 · bf94e56
2 parents 6bdc5fc + b27d0bb
commit bf94e56
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/...ain/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java b/...ain/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
@@ -131,9 +131,11 @@ private void checkClickedBlock(Event e, Player player, Location loc, Material ty
         case CAULDRON:
             checkIsland(e, player, loc, Flags.BREWING);
             break;
-        case BARREL:
         case BEEHIVE:
         case BEE_NEST:
+            checkIsland(e, player, loc, Flags.HIVE);
+            break;
+        case BARREL:
         case CHEST:
         case CHEST_MINECART:
         case TRAPPED_CHEST:

diff --git a/src/main/java/world/bentobox/bentobox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java
@@ -128,6 +128,8 @@ private Flags() {}
     public static final Flag SPAWN_EGGS = new Flag.Builder("SPAWN_EGGS", Material.COW_SPAWN_EGG).build();
     public static final Flag ITEM_FRAME = new Flag.Builder("ITEM_FRAME", Material.ITEM_FRAME).mode(Flag.Mode.ADVANCED).build();
     public static final Flag CAKE = new Flag.Builder("CAKE", Material.CAKE).build();
+    public static final Flag HIVE = new Flag.Builder("HIVE", Material.HONEY_BOTTLE).type(Type.PROTECTION).build();
+
     /**
      * Prevents players from interacting with the Dragon Egg.
      * @since 1.3.1

diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
@@ -952,6 +952,11 @@ protection:
          &a outside protected
          &a island space
       name: "&e Limit mobs to island"
+    HIVE:
+      description: |-
+        &a Toggle hive harvesting.
+      name: "Hive harvesting"
+      hint: "Harvesting disabled"
     HURT_ANIMALS: 
       description: "Toggle hurting"
       name: "Hurt animals"

diff --git a/...java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java b/...java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java
@@ -112,6 +112,8 @@ private void setFlags() {
         clickedBlocks.put(Material.ITEM_FRAME, Flags.ITEM_FRAME);
         clickedBlocks.put(Material.SWEET_BERRY_BUSH, Flags.BREAK_BLOCKS);
         clickedBlocks.put(Material.CAKE, Flags.CAKE);
+        clickedBlocks.put(Material.BEEHIVE, Flags.HIVE);
+        clickedBlocks.put(Material.BEE_NEST, Flags.HIVE);
     }