forked from SteamWar/SteamWar
Optimize some stuff and fix some other stuff
This commit is contained in:
@@ -56,6 +56,7 @@ public class BauInfoBauGuiItem extends BauGuiItem {
|
|||||||
Region region = Region.getRegion(player.getLocation());
|
Region region = Region.getRegion(player.getLocation());
|
||||||
List<String> stringList = new ArrayList<>();
|
List<String> stringList = new ArrayList<>();
|
||||||
for (Flag flag : Flag.getFlags()) {
|
for (Flag flag : Flag.getFlags()) {
|
||||||
|
if (flag == Flag.CHANGED) continue;
|
||||||
if (!region.getRegionData().has(flag).isApplicable()) continue;
|
if (!region.getRegionData().has(flag).isApplicable()) continue;
|
||||||
FlagOptional<?> value = region.getRegionData().get(flag);
|
FlagOptional<?> value = region.getRegionData().get(flag);
|
||||||
if (value.isPresent()) {
|
if (value.isPresent()) {
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ import lombok.RequiredArgsConstructor;
|
|||||||
|
|
||||||
import javax.annotation.CheckReturnValue;
|
import javax.annotation.CheckReturnValue;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@@ -42,7 +41,7 @@ public interface RegionBackups {
|
|||||||
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
abstract class Backup implements Comparator<Backup> {
|
abstract class Backup implements Comparable<Backup> {
|
||||||
@NonNull
|
@NonNull
|
||||||
private final BackupType type;
|
private final BackupType type;
|
||||||
|
|
||||||
@@ -60,8 +59,8 @@ public interface RegionBackups {
|
|||||||
public abstract long getCreationTime();
|
public abstract long getCreationTime();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int compare(Backup o1, Backup o2) {
|
public int compareTo(Backup o) {
|
||||||
return Long.compare(o1.getCreationTime(), o2.getCreationTime());
|
return Long.compare(getCreationTime(), o.getCreationTime());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -36,7 +36,6 @@ import lombok.NonNull;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import sun.misc.Unsafe;
|
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.RecordComponent;
|
import java.lang.reflect.RecordComponent;
|
||||||
@@ -138,6 +137,7 @@ public class DynamicRegionSystem implements RegionSystem {
|
|||||||
return GlobalRegion.INSTANCE;
|
return GlobalRegion.INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Optimize later on!
|
||||||
private Region get(Location location, Collection<Region> regions) {
|
private Region get(Location location, Collection<Region> regions) {
|
||||||
return regions.stream()
|
return regions.stream()
|
||||||
.filter(region -> region.getArea().inRegion(location, false))
|
.filter(region -> region.getArea().inRegion(location, false))
|
||||||
|
|||||||
+1
-1
@@ -87,7 +87,7 @@ public class RegionDataRepository {
|
|||||||
regionCreators.put(MiniWarGear21DisplayRegion.class.getSimpleName(), MiniWarGear21DisplayRegion::new);
|
regionCreators.put(MiniWarGear21DisplayRegion.class.getSimpleName(), MiniWarGear21DisplayRegion::new);
|
||||||
regionCreators.put("MiniWarGear21Region", MiniWarGear21WorkRegion::new); // TODO: Legacy because of rename
|
regionCreators.put("MiniWarGear21Region", MiniWarGear21WorkRegion::new); // TODO: Legacy because of rename
|
||||||
regionCreators.put(WarShip21WorkRegion.class.getSimpleName(), WarShip21WorkRegion::new);
|
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("WarShip21Region", WarShip21WorkRegion::new); // TODO: Legacy because of rename
|
||||||
regionCreators.put(MicroWarGear21WorkRegion.class.getSimpleName(), MicroWarGear21WorkRegion::new);
|
regionCreators.put(MicroWarGear21WorkRegion.class.getSimpleName(), MicroWarGear21WorkRegion::new);
|
||||||
regionCreators.put(MicroWarGear21DisplayRegion.class.getSimpleName(), MicroWarGear21DisplayRegion::new);
|
regionCreators.put(MicroWarGear21DisplayRegion.class.getSimpleName(), MicroWarGear21DisplayRegion::new);
|
||||||
|
|||||||
Reference in New Issue
Block a user