From 38303d1315f0ac1f95779f55c34937fd1b74e101 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Mon, 6 Jan 2020 12:05:27 +0100 Subject: [PATCH 1/2] Adding/removing Schemtypes --- .../src/de/steamwar/sql/SchematicType.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java b/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java index 783f077..13b6bae 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java +++ b/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java @@ -22,16 +22,20 @@ public enum SchematicType { CWarShip1_9("CWS1.9", Type.CHECK_TYPE), CWarShip1_8("CWS1.8", Type.CHECK_TYPE), CWarGear1_7("CWG1.7", Type.CHECK_TYPE), + WarGear1_14("WG1.14", Type.FIGHT_TYPE, null), + WarShip1_14("WS1.14", Type.FIGHT_TYPE, null), MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12), 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), WarShip1_10("WS1.10", Type.FIGHT_TYPE, CWarShip1_10), WarShip1_9("WS1.9", Type.FIGHT_TYPE, CWarShip1_9), 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 fromDB = new HashMap<>(); @@ -56,7 +60,7 @@ public enum SchematicType { } public boolean isAssignable(){ - return type == Type.NORMAL || type == Type.FIGHT_TYPE; + return type == Type.NORMAL || (type == Type.FIGHT_TYPE && checkType != null); } public SchematicType checkType(){ From 4b2427527f535092417b40b1b200917c72b8553d Mon Sep 17 00:00:00 2001 From: Lixfel Date: Mon, 6 Jan 2020 12:15:06 +0100 Subject: [PATCH 2/2] Removing WS 1.14 --- SpigotCore_Main/src/de/steamwar/sql/SchematicType.java | 1 - 1 file changed, 1 deletion(-) diff --git a/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java b/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java index 13b6bae..93af6c1 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java +++ b/SpigotCore_Main/src/de/steamwar/sql/SchematicType.java @@ -23,7 +23,6 @@ public enum SchematicType { CWarShip1_8("CWS1.8", Type.CHECK_TYPE), CWarGear1_7("CWG1.7", Type.CHECK_TYPE), WarGear1_14("WG1.14", Type.FIGHT_TYPE, null), - WarShip1_14("WS1.14", Type.FIGHT_TYPE, null), MPPWarGear1_12("MPPWG", Type.FIGHT_TYPE, CMPPWarGear1_12), SGWarShip("SGWS", Type.FIGHT_TYPE, CSGWarShip), WarGear1_12("WG1.12", Type.FIGHT_TYPE, null),