SteamWar/FightSystem
Archiviert
13
1

Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master

Dieser Commit ist enthalten in:
Lixfel 2020-01-20 17:47:42 +01:00 committet von Gitea
Commit 5a9e281c95
2 geänderte Dateien mit 12 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -61,6 +61,7 @@ public class Config {
//schematic parameter //schematic parameter
public static final boolean OnlyPublicSchematics; public static final boolean OnlyPublicSchematics;
public static final boolean IgnorePublicOnly;
public static final de.steamwar.sql.SchematicType SchematicType; public static final de.steamwar.sql.SchematicType SchematicType;
public static final boolean TeamRedRotate; public static final boolean TeamRedRotate;
public static final boolean TeamBlueRotate; public static final boolean TeamBlueRotate;
@ -149,6 +150,7 @@ public class Config {
WaterDepth = worldconfig.getInt("Arena.WaterDepth"); WaterDepth = worldconfig.getInt("Arena.WaterDepth");
SchematicType = de.steamwar.sql.SchematicType.fromDB(config.getString("Schematic.SchematicType")); SchematicType = de.steamwar.sql.SchematicType.fromDB(config.getString("Schematic.SchematicType"));
IgnorePublicOnly = config.getBoolean("Schematic.IgnorePublicOnly");
boolean rotate = config.getBoolean("Schematic.Rotate"); boolean rotate = config.getBoolean("Schematic.Rotate");
ReplaceObsidian = config.getBoolean("Schematic.ReplaceObsidian"); ReplaceObsidian = config.getBoolean("Schematic.ReplaceObsidian");
ReplaceBedrock = config.getBoolean("Schematic.ReplaceBedrock"); ReplaceBedrock = config.getBoolean("Schematic.ReplaceBedrock");

Datei anzeigen

@ -114,6 +114,16 @@ public class Fight {
} }
public static void calcAvailibleSchemTypes() { public static void calcAvailibleSchemTypes() {
if(Config.IgnorePublicOnly){
onlyPublicSchems = false;
return;
}
if(Config.OnlyPublicSchematics){
onlyPublicSchems = true;
return;
}
if(redTeam.getLeader() == null || redTeam.getLeader().getPlayer() == null || if(redTeam.getLeader() == null || redTeam.getLeader().getPlayer() == null ||
blueTeam.getLeader() == null || blueTeam.getLeader().getPlayer() == null){ blueTeam.getLeader() == null || blueTeam.getLeader().getPlayer() == null){
onlyPublicSchems = false; onlyPublicSchems = false;