Merge pull request 'Fix QuickGear' (#59) from fix-quickgear into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #59 Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Commit
e664c6cf4e
@ -26,7 +26,7 @@ import java.util.*;
|
|||||||
|
|
||||||
public class SchematicType {
|
public class SchematicType {
|
||||||
|
|
||||||
public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON");
|
public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null, "STONE_BUTTON", false);
|
||||||
|
|
||||||
private static final Map<String, SchematicType> fromDB;
|
private static final Map<String, SchematicType> fromDB;
|
||||||
private static final List<SchematicType> types;
|
private static final List<SchematicType> types;
|
||||||
@ -60,25 +60,31 @@ public class SchematicType {
|
|||||||
private final String material;
|
private final String material;
|
||||||
@Getter
|
@Getter
|
||||||
private final Date deadline;
|
private final Date deadline;
|
||||||
|
@Getter
|
||||||
|
private final boolean manualCheck;
|
||||||
|
|
||||||
SchematicType(String name, String kuerzel, Type type, SchematicType checkType, String material){
|
SchematicType(String name, String kuerzel, Type type, SchematicType checkType, String material, boolean manualCheck){
|
||||||
this(name, kuerzel, type, checkType, material, null);
|
this(name, kuerzel, type, checkType, material, null, manualCheck);
|
||||||
}
|
}
|
||||||
|
|
||||||
SchematicType(String name, String kuerzel, Type type, SchematicType checkType, String material, Date deadline){
|
SchematicType(String name, String kuerzel, Type type, SchematicType checkType, String material, Date deadline, boolean manualCheck){
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.kuerzel = kuerzel;
|
this.kuerzel = kuerzel;
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.checkType = checkType;
|
this.checkType = checkType;
|
||||||
this.material = material;
|
this.material = material;
|
||||||
this.deadline = deadline;
|
this.deadline = deadline;
|
||||||
|
this.manualCheck = manualCheck;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isAssignable(){
|
public boolean isAssignable(){
|
||||||
return type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null);
|
return type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null) || !manualCheck;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SchematicType checkType(){
|
public SchematicType checkType(){
|
||||||
|
if (!manualCheck) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
return checkType;
|
return checkType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren