Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-05 18:17:32 +02:00
Code Issues Projects Releases Wiki Activity

Shifted to using 1.14.4 materials.

Browse Source 
Still compatible with 1.13.2.

Fixes https://github.com/BentoBoxWorld/BentoBox/issues/893
This commit is contained in:
tastybento 2019-08-30 21:01:15 -07:00
parent 60d7dfef85
commit a8c44ff028
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,23 +29,11 @@ import world.bentobox.bentobox.lists.Flags;
*/
public class BlockInteractionListener extends FlagListener {
private static final String FURNACE = "FURNACE";
private static final String CRAFTING = "CRAFTING";
/**
* These cover materials in another server version.
* This avoids run time errors due to unknown enum values, at the expense of a string comparison
*/
private final Map<String, String> stringFlags = ImmutableMap.<String, String>builder()
.put("CAMPFIRE", FURNACE)
.put("CARTOGRAPHY_TABLE", CRAFTING)
.put("GRINDSTONE", CRAFTING)
.put("LECTERN", "BREAK_BLOCKS")
.put("LOOM", CRAFTING)
.put("STONECUTTER", CRAFTING)
.put("SMOKER", FURNACE)
.put("BLAST_FURNACE", FURNACE)
.put("COMPOSTER", "CONTAINER")
.build();
/**
@ -185,6 +173,7 @@ public class BlockInteractionListener extends FlagListener {
case CAULDRON:
checkIsland(e, player, loc, Flags.BREWING);
break;
case BARREL:
case CHEST:
case CHEST_MINECART:
case TRAPPED_CHEST:
@ -206,6 +195,7 @@ public class BlockInteractionListener extends FlagListener {
case YELLOW_SHULKER_BOX:
case SHULKER_BOX:
case FLOWER_POT:
case COMPOSTER:
checkIsland(e, player, loc, Flags.CONTAINER);
break;
case DISPENSER:
@ -244,8 +234,11 @@ public class BlockInteractionListener extends FlagListener {
case SPRUCE_FENCE_GATE:
checkIsland(e, player, loc, Flags.GATE);
break;
case BLAST_FURNACE:
case CAMPFIRE:
case FURNACE_MINECART:
case FURNACE:
case SMOKER:
checkIsland(e, player, loc, Flags.FURNACE);
break;
case ENCHANTING_TABLE:
@ -261,6 +254,10 @@ public class BlockInteractionListener extends FlagListener {
checkIsland(e, player, loc, Flags.NOTE_BLOCK);
break;
case CRAFTING_TABLE:
case CARTOGRAPHY_TABLE:
case GRINDSTONE:
case STONECUTTER:
case LOOM:
checkIsland(e, player, loc, Flags.CRAFTING);
break;
case STONE_BUTTON:
@ -289,6 +286,9 @@ public class BlockInteractionListener extends FlagListener {
case ITEM_FRAME:
checkIsland(e, player, loc, Flags.ITEM_FRAME);
break;
case LECTERN:
checkIsland(e, player, loc, Flags.BREAK_BLOCKS);
break;
default:
if (stringFlags.containsKey(type.name())) {
Optional<Flag> f = BentoBox.getInstance().getFlagsManager().getFlag(stringFlags.get(type.name()));