diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java index afe30aa1..3cf4d1dc 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java @@ -37,6 +37,7 @@ public class FireListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { + if (region.get(Flag.FIRE) == Flag.FIRE.getDefaultValue()) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.FIRE).getChatValue(), p); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java index 10beca8f..df73575c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java @@ -199,6 +199,7 @@ public class FreezeListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { + if (region.get(Flag.FREEZE) == Flag.FREEZE.getDefaultValue()) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.FREEZE).getChatValue(), p); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java index cbde76cf..3b99382d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java @@ -54,16 +54,6 @@ public class ItemsCommand extends SWCommand { } } - @Register(value = "global") - public void globalToggleCommand(@Validator Player p) { - Region region = GlobalRegion.getInstance(); - if (toggle(region)) { - RegionUtils.actionBar(region, getEnableMessage()); - } else { - RegionUtils.actionBar(region, getDisableMessage()); - } - } - private String getNoPermMessage() { return "REGION_ITEMS_NO_PERMS"; } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java index 1becf08b..66e1fdb7 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java @@ -20,7 +20,6 @@ package de.steamwar.bausystem.features.region; import de.steamwar.bausystem.BauSystem; -import de.steamwar.bausystem.region.GlobalRegion; import de.steamwar.bausystem.region.Region; import de.steamwar.bausystem.region.flags.Flag; import de.steamwar.bausystem.region.flags.flagvalues.ItemMode; @@ -37,8 +36,6 @@ import org.bukkit.event.entity.ItemSpawnEvent; public class ItemsListener implements Listener, ScoreboardElement { private static ItemMode getMode(Region region) { - ItemMode itemMode = GlobalRegion.getInstance().getPlain(Flag.ITEMS, ItemMode.class); - if (itemMode == ItemMode.INACTIVE) return ItemMode.INACTIVE; return region.getPlain(Flag.ITEMS, ItemMode.class); } @@ -61,8 +58,7 @@ public class ItemsListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - ItemMode itemMode = getMode(region); - if (itemMode == ItemMode.ACTIVE) return null; - return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(itemMode.getChatValue(), p); + if (region.get(Flag.ITEMS) == Flag.ITEMS.getDefaultValue()) return null; + return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.ITEMS).getChatValue(), p); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java index 9b173359..65ec30de 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java @@ -53,6 +53,7 @@ public class ProtectListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { if (region.getFloorLevel() == 0) return null; + if (region.get(Flag.PROTECT) != Flag.PROTECT.getDefaultValue()) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.get(Flag.PROTECT).getChatValue(), p); } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java index 86888666..32a49387 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java @@ -34,7 +34,7 @@ public enum Flag implements EnumDisplay { FIRE("FLAG_FIRE", FireMode.class, FireMode.ALLOW), FREEZE("FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE), PROTECT("FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE), - ITEMS("FLAG_ITEMS", ItemMode.class, ItemMode.ACTIVE), + ITEMS("FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE), ; @Getter