Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-10 09:21:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'harvest' into develop

Browse Source
This commit is contained in:
tastybento 2021-02-14 16:57:16 -08:00
commit bf94e56f78
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
View File

@ -131,9 +131,11 @@ public class BlockInteractionListener extends FlagListener {
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:

2
src/main/java/world/bentobox/bentobox/lists/Flags.java
View File

@ -128,6 +128,8 @@ public final class 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

5
src/main/resources/locales/en-US.yml
View File

@ -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"

2
src/test/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListenerTest.java
View File

@ -112,6 +112,8 @@ public class BlockInteractionListenerTest extends AbstractCommonSetup {
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);
}