Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-30 23:57:30 +02:00
Code Issues Projects Releases Wiki Activity

Splited MUSIC flag into JUKEBOX and NOTE_BLOCK

Browse Source 
It has been suggested in #182.
This commit is contained in:
Florian CUNY 2018-06-16 16:46:01 +02:00
parent d4264a1c26
commit 4525a04324
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/us/tastybento/bskyblock/listeners/flags/BlockInteractionListener.java
View File

@ -97,8 +97,10 @@ public class BlockInteractionListener extends AbstractFlagListener {
case ENDER_CHEST: case ENDER_CHEST:
break; break;
case JUKEBOX: case JUKEBOX:
checkIsland(e, e.getClickedBlock().getLocation(), Flags.JUKEBOX);
break;
case NOTE_BLOCK: case NOTE_BLOCK:
checkIsland(e, e.getClickedBlock().getLocation(), Flags.MUSIC); checkIsland(e, e.getClickedBlock().getLocation(), Flags.NOTE_BLOCK);
break; break;
case WORKBENCH: case WORKBENCH:
checkIsland(e, e.getClickedBlock().getLocation(), Flags.CRAFTING); checkIsland(e, e.getClickedBlock().getLocation(), Flags.CRAFTING);

4
src/main/java/us/tastybento/bskyblock/lists/Flags.java
View File

@ -62,7 +62,8 @@ public class Flags {
public static final Flag ENCHANTING = new FlagBuilder().id("ENCHANTING").allowedByDefault(true).icon(Material.ENCHANTMENT_TABLE).build(); public static final Flag ENCHANTING = new FlagBuilder().id("ENCHANTING").allowedByDefault(true).icon(Material.ENCHANTMENT_TABLE).build();
public static final Flag FURNACE = new FlagBuilder().id("FURNACE").icon(Material.FURNACE).build(); public static final Flag FURNACE = new FlagBuilder().id("FURNACE").icon(Material.FURNACE).build();
public static final Flag GATE = new FlagBuilder().id("GATE").allowedByDefault(true).icon(Material.FENCE_GATE).build(); public static final Flag GATE = new FlagBuilder().id("GATE").allowedByDefault(true).icon(Material.FENCE_GATE).build();
public static final Flag MUSIC = new FlagBuilder().id("MUSIC").icon(Material.JUKEBOX).build(); public static final Flag NOTE_BLOCK = new FlagBuilder().id("NOTE_BLOCK").icon(Material.NOTE_BLOCK).build();
public static final Flag JUKEBOX = new FlagBuilder().id("JUKEBOX").icon(Material.JUKEBOX).build();
public static final Flag LEVER_BUTTON = new FlagBuilder().id("LEVER_BUTTON").icon(Material.LEVER).build(); public static final Flag LEVER_BUTTON = new FlagBuilder().id("LEVER_BUTTON").icon(Material.LEVER).build();
public static final Flag REDSTONE = new FlagBuilder().id("REDSTONE").icon(Material.REDSTONE).build(); public static final Flag REDSTONE = new FlagBuilder().id("REDSTONE").icon(Material.REDSTONE).build();
public static final Flag SPAWN_EGGS = new FlagBuilder().id("SPAWN_EGGS").icon(Material.MONSTER_EGG).build(); public static final Flag SPAWN_EGGS = new FlagBuilder().id("SPAWN_EGGS").icon(Material.MONSTER_EGG).build();
@ -160,6 +161,7 @@ public class Flags {
.listener(ilv).onClick(ilv).build(); .listener(ilv).onClick(ilv).build();
public static final Flag REMOVE_MOBS = new FlagBuilder().id("REMOVE_MOBS").icon(Material.GLOWSTONE_DUST).type(Type.WORLD_SETTING) public static final Flag REMOVE_MOBS = new FlagBuilder().id("REMOVE_MOBS").icon(Material.GLOWSTONE_DUST).type(Type.WORLD_SETTING)
.listener(new RemoveMobsListener()).allowedByDefault(true).onClick(new WorldToggleClickListener("REMOVE_MOBS")).build(); .listener(new RemoveMobsListener()).allowedByDefault(true).onClick(new WorldToggleClickListener("REMOVE_MOBS")).build();
/** /**
* @return List of all the flags in this class * @return List of all the flags in this class
*/ */