From 3fe28cfba9bd08919eae06e28cff5d2f776e07ed Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Fri, 6 Mar 2026 15:44:27 +0100 Subject: [PATCH] Fix RegionFlagPolicy --- .../de/steamwar/bausystem/features/region/FireListener.java | 2 +- .../de/steamwar/bausystem/features/region/FreezeListener.java | 2 +- .../de/steamwar/bausystem/features/region/ItemsListener.java | 2 +- .../steamwar/bausystem/features/region/NoGravityListener.java | 2 +- .../steamwar/bausystem/features/region/ProtectListener.java | 2 +- .../de/steamwar/bausystem/features/region/TNTListener.java | 2 +- .../bausystem/features/region/WaterDestroyListener.java | 2 +- .../src/de/steamwar/bausystem/region/RegionFlagPolicy.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java index f54de73a..20f7ee6a 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java @@ -60,7 +60,7 @@ public class FireListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.FIRE).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.FIRE).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FIRE).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java index 6b9ef3ad..3dc8520b 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java @@ -249,7 +249,7 @@ public class FreezeListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.FREEZE).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.FREEZE).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FREEZE).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java index 9f939192..4059d07b 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java @@ -52,7 +52,7 @@ public class ItemsListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.ITEMS).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.ITEMS).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.ITEMS).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java index adcf4db6..9c885785 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java @@ -54,7 +54,7 @@ public class NoGravityListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.NO_GRAVITY).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.NO_GRAVITY).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java index ef3731c5..b5489b2b 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java @@ -70,7 +70,7 @@ public class ProtectListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.PROTECT).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.PROTECT).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.PROTECT).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java index 39dd3dbd..ad80a5ec 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java @@ -82,7 +82,7 @@ public class TNTListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.TNT).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.TNT).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.TNT).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyListener.java index 3ebde4dc..4ab57996 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyListener.java @@ -53,7 +53,7 @@ public class WaterDestroyListener implements Listener, ScoreboardElement { @Override public String get(Region region, Player p) { - if (region.getRegionData().has(Flag.WATER_DESTROY).isNotApplicable()) return null; + if (region.getRegionData().has(Flag.WATER_DESTROY).notVisibleInScoreboard()) return null; if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.ALLOW)) return null; return "§e" + BauSystem.MESSAGE.parse(Flag.WATER_DESTROY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.WATER_DESTROY).getWithDefault().getChatValue(), p); } diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java index f355762e..79bd910b 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionFlagPolicy.java @@ -36,7 +36,7 @@ public enum RegionFlagPolicy { return readable || writable; } - public boolean isNotApplicable() { - return this == NOT_APPLICABLE; + public boolean notVisibleInScoreboard() { + return !writable; } }