diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java index b0f15859..66c444c7 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java @@ -56,6 +56,7 @@ public class BauInfoBauGuiItem extends BauGuiItem { Region region = Region.getRegion(player.getLocation()); List stringList = new ArrayList<>(); for (Flag flag : Flag.getFlags()) { + if (flag == Flag.CHANGED) continue; if (!region.getRegionData().has(flag).isApplicable()) continue; FlagOptional value = region.getRegionData().get(flag); if (value.isPresent()) { diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java index af85edaf..5d29bde6 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/RegionBackups.java @@ -25,7 +25,6 @@ import lombok.RequiredArgsConstructor; import javax.annotation.CheckReturnValue; import javax.annotation.Nullable; -import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -42,7 +41,7 @@ public interface RegionBackups { @RequiredArgsConstructor @Getter - abstract class Backup implements Comparator { + abstract class Backup implements Comparable { @NonNull private final BackupType type; @@ -60,8 +59,8 @@ public interface RegionBackups { public abstract long getCreationTime(); @Override - public int compare(Backup o1, Backup o2) { - return Long.compare(o1.getCreationTime(), o2.getCreationTime()); + public int compareTo(Backup o) { + return Long.compare(getCreationTime(), o.getCreationTime()); } } diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java index cb0f529d..e113f7b3 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/DynamicRegionSystem.java @@ -36,7 +36,6 @@ import lombok.NonNull; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import sun.misc.Unsafe; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.RecordComponent; @@ -138,6 +137,7 @@ public class DynamicRegionSystem implements RegionSystem { return GlobalRegion.INSTANCE; } + // TODO: Optimize later on! private Region get(Location location, Collection regions) { return regions.stream() .filter(region -> region.getArea().inRegion(location, false)) diff --git a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/RegionDataRepository.java b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/RegionDataRepository.java index e389c179..75f81116 100644 --- a/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/RegionDataRepository.java +++ b/BauSystem/BauSystem_RegionDynamic/src/de/steamwar/bausystem/region/dynamic/RegionDataRepository.java @@ -87,7 +87,7 @@ public class RegionDataRepository { regionCreators.put(MiniWarGear21DisplayRegion.class.getSimpleName(), MiniWarGear21DisplayRegion::new); regionCreators.put("MiniWarGear21Region", MiniWarGear21WorkRegion::new); // TODO: Legacy because of rename regionCreators.put(WarShip21WorkRegion.class.getSimpleName(), WarShip21WorkRegion::new); - regionCreators.put(WarShip21DisplayRegion.class.getSimpleName(), WarShip21WorkRegion::new); + regionCreators.put(WarShip21DisplayRegion.class.getSimpleName(), WarShip21DisplayRegion::new); regionCreators.put("WarShip21Region", WarShip21WorkRegion::new); // TODO: Legacy because of rename regionCreators.put(MicroWarGear21WorkRegion.class.getSimpleName(), MicroWarGear21WorkRegion::new); regionCreators.put(MicroWarGear21DisplayRegion.class.getSimpleName(), MicroWarGear21DisplayRegion::new);