forked from SteamWar/SteamWar
Add GameModeConfig.EMPTY
This commit is contained in:
+1
-3
@@ -89,8 +89,6 @@ public class GlobalRegion implements Region {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
private static final GameModeConfig GLOBAL_CONFIG = new GameModeConfig(null);
|
|
||||||
|
|
||||||
private static DefaultFlagStorage FLAG_STORAGE = new NonNormalFlagStorage();
|
private static DefaultFlagStorage FLAG_STORAGE = new NonNormalFlagStorage();
|
||||||
static {
|
static {
|
||||||
RegionDataRepository.loadFlagStorage(INSTANCE, FLAG_STORAGE);
|
RegionDataRepository.loadFlagStorage(INSTANCE, FLAG_STORAGE);
|
||||||
@@ -131,7 +129,7 @@ public class GlobalRegion implements Region {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull GameModeConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return GLOBAL_CONFIG;
|
return GameModeConfig.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -36,7 +36,6 @@ public class PathRegion extends DynamicRegion {
|
|||||||
|
|
||||||
private DefaultFlagStorage flagStorage = new NonNormalFlagStorage();
|
private DefaultFlagStorage flagStorage = new NonNormalFlagStorage();
|
||||||
private final Area area;
|
private final Area area;
|
||||||
private final GameModeConfig config = new GameModeConfig(null);
|
|
||||||
|
|
||||||
public PathRegion(int minX, int minZ) {
|
public PathRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
@@ -100,7 +99,7 @@ public class PathRegion extends DynamicRegion {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull GameModeConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return GameModeConfig.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -38,7 +38,6 @@ public class SpawnPathRegion extends DynamicRegion {
|
|||||||
|
|
||||||
private DefaultFlagStorage flagStorage = new NonNormalFlagStorage();
|
private DefaultFlagStorage flagStorage = new NonNormalFlagStorage();
|
||||||
private final Area area;
|
private final Area area;
|
||||||
private final GameModeConfig config = new GameModeConfig(null);
|
|
||||||
|
|
||||||
public SpawnPathRegion(int minX, int minZ) {
|
public SpawnPathRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
@@ -101,7 +100,7 @@ public class SpawnPathRegion extends DynamicRegion {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull GameModeConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return GameModeConfig.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-2
@@ -35,7 +35,6 @@ public class SpawnRegion extends DynamicRegion {
|
|||||||
|
|
||||||
private DefaultFlagStorage flagStorage = new NonNormalFlagStorage();
|
private DefaultFlagStorage flagStorage = new NonNormalFlagStorage();
|
||||||
private final Area area;
|
private final Area area;
|
||||||
private final GameModeConfig config = new GameModeConfig(null);
|
|
||||||
|
|
||||||
public SpawnRegion(int minX, int minZ) {
|
public SpawnRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
@@ -85,7 +84,7 @@ public class SpawnRegion extends DynamicRegion {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull GameModeConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return GameModeConfig.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-3
@@ -36,8 +36,6 @@ public abstract class SpecialRegion extends DynamicRegion {
|
|||||||
@Getter
|
@Getter
|
||||||
protected SpecialAreaTile area;
|
protected SpecialAreaTile area;
|
||||||
|
|
||||||
private final GameModeConfig config = new GameModeConfig(null);
|
|
||||||
|
|
||||||
protected SpecialRegion(int minX, int minZ) {
|
protected SpecialRegion(int minX, int minZ) {
|
||||||
super(minX, minZ);
|
super(minX, minZ);
|
||||||
RegionDataRepository.loadFlagStorage(this, flags);
|
RegionDataRepository.loadFlagStorage(this, flags);
|
||||||
@@ -69,7 +67,7 @@ public abstract class SpecialRegion extends DynamicRegion {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull GameModeConfig getGameModeConfig() {
|
public @NonNull GameModeConfig getGameModeConfig() {
|
||||||
return config;
|
return GameModeConfig.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user