SteamWar/SpigotCore
SteamWar/SpigotCore
Archiviert
13
0
Fork 0
Code Issues 4 Pull-Requests 1 Releases Wiki Aktivität

Merge branch 'new_schemtypes' of SteamWar/SpigotCore into master

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Lixfel 2020-01-07 06:30:09 +01:00 committet von Gitea
Commit 2e27fac7c7
1 geänderte Dateien mit 7 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
SpigotCore_Main/src/de/steamwar/sql/SchematicType.java
Datei anzeigen

@ -22,16 +22,19 @@ public enum SchematicType {
CWarShip1_9("CWS1.9", Type.CHECK_TYPE), CWarShip1_9("CWS1.9", Type.CHECK_TYPE),
CWarShip1_8("CWS1.8", Type.CHECK_TYPE), CWarShip1_8("CWS1.8", Type.CHECK_TYPE),
CWarGear1_7("CWG1.7", Type.CHECK_TYPE), CWarGear1_7("CWG1.7", Type.CHECK_TYPE),
WarGear1_14("WG1.14", Type.FIGHT_TYPE, null),
MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12), MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12),
SGWarShip("SGWS", Type.FIGHT_TYPE, CSGWarShip), SGWarShip("SGWS", Type.FIGHT_TYPE, CSGWarShip),
WarGear1_12("WG1.12", Type.FIGHT_TYPE, null),
WarShip1_12("WS1.12", Type.FIGHT_TYPE, null),
MiniWarGear1_12("MWG1.12", Type.FIGHT_TYPE, null),
WarGear1_10("WG1.10", Type.FIGHT_TYPE, CWarGear1_10), WarGear1_10("WG1.10", Type.FIGHT_TYPE, CWarGear1_10),
WarShip1_10("WS1.10", Type.FIGHT_TYPE, CWarShip1_10), WarShip1_10("WS1.10", Type.FIGHT_TYPE, CWarShip1_10),
WarShip1_9("WS1.9", Type.FIGHT_TYPE, CWarShip1_9), WarShip1_9("WS1.9", Type.FIGHT_TYPE, CWarShip1_9),
WarShip1_8("WS1.8", Type.FIGHT_TYPE, CWarShip1_8), WarShip1_8("WS1.8", Type.FIGHT_TYPE, CWarShip1_8),
WarGear1_7("WG1.7", Type.FIGHT_TYPE, CWarGear1_7), WarGear1_7("WG1.7", Type.FIGHT_TYPE, CWarGear1_7)
COldschoolWG("COWG", Type.CHECK_TYPE), ;
OldschoolWG("OWG", Type.FIGHT_TYPE, COldschoolWG);
private static Map<String, SchematicType> fromDB = new HashMap<>(); private static Map<String, SchematicType> fromDB = new HashMap<>();
@ -56,7 +59,7 @@ public enum SchematicType {
} }
public boolean isAssignable(){ public boolean isAssignable(){
return type == Type.NORMAL || type == Type.FIGHT_TYPE; return type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null);
} }
public SchematicType checkType(){ public SchematicType checkType(){