Fix Bugs

Signed-off-by: Lixfel <agga-games@gmx.de>

CommonCore

@@ -1 +1 @@
-Subproject commit 9b53ad748b32cc38ade1ccc606b116c0d6fbf1fb
+Subproject commit 588d3c9dda47a8e61e4e01eea9c915f9d853eb3b

src/de/steamwar/bungeecore/ServerStarter.java

@@ -144,8 +144,8 @@ public class ServerStarter {
     public ServerStarter tutorial(ProxiedPlayer owner, Tutorial tutorial) {
         directory = new File(SERVER_PATH, "Tutorial");
         buildWithTemp(owner);
-        tempWorld(TUTORIAL_PATH + tutorial.getId());
+        tempWorld(TUTORIAL_PATH + tutorial.getTutorialId());
-        arguments.put("tutorial", String.valueOf(tutorial.getId()));
+        arguments.put("tutorial", String.valueOf(tutorial.getTutorialId()));
         return send(owner);
     }
 

src/de/steamwar/bungeecore/commands/EventCommand.java

@@ -64,10 +64,9 @@ public class EventCommand extends SWCommand {
                 if(now.isBefore(e.getDeadline().toInstant())) {
                     Message.send("EVENT_COMING_DEADLINE", player, e.getDeadline());
                 }
-                String schemType = e.getSchemType();
+                SchematicType schemType = e.getSchematicType();
                 if (schemType != null) {
-                    SchematicType schematicType = SchematicType.fromDB(schemType);
+                    if (schemType.getDeadline() != null && now.isBefore(schemType.getDeadline().toInstant())) {
-                    if (schematicType != null && schematicType.getDeadline() != null && now.isBefore(schematicType.getDeadline().toInstant())) {
                         Message.send("EVENT_COMING_SCHEM_DEADLINE", player, e.getDeadline());
                     }
                 }

src/de/steamwar/bungeecore/commands/TutorialCommand.java

@@ -165,6 +165,6 @@ public class TutorialCommand extends SWCommand {
     }
 
     private File world(Tutorial tutorial) {
-        return new File(ServerStarter.TUTORIAL_PATH, String.valueOf(tutorial.getId()));
+        return new File(ServerStarter.TUTORIAL_PATH, String.valueOf(tutorial.getTutorialId()));
     }
 }