From e327c939f7c22ab50a2b466f045967d860773e58 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 23 Jun 2022 10:00:26 +0200 Subject: [PATCH] Cleanup branch Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/commands/EventCommand.java | 6 +++--- src/de/steamwar/bungeecore/sql/SchematicType.java | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/de/steamwar/bungeecore/commands/EventCommand.java b/src/de/steamwar/bungeecore/commands/EventCommand.java index 6e2c66c..75f718f 100644 --- a/src/de/steamwar/bungeecore/commands/EventCommand.java +++ b/src/de/steamwar/bungeecore/commands/EventCommand.java @@ -81,9 +81,9 @@ public class EventCommand extends BasicCommand { if(now.isBefore(e.getDeadline().toInstant())) { Message.send("EVENT_COMING_DEADLINE", player, e.getDeadline()); } - String checkType = e.getSchemType(); - if (checkType != null) { - SchematicType schematicType = SchematicType.fromDB(checkType); + String schemType = e.getSchemType(); + if (schemType != null) { + SchematicType schematicType = SchematicType.fromDB(schemType); if (schematicType != null && schematicType.deadline() != null && now.isBefore(schematicType.deadline().toInstant())) { Message.send("EVENT_COMING_SCHEM_DEADLINE", player, e.getDeadline()); } diff --git a/src/de/steamwar/bungeecore/sql/SchematicType.java b/src/de/steamwar/bungeecore/sql/SchematicType.java index f63633e..9592070 100644 --- a/src/de/steamwar/bungeecore/sql/SchematicType.java +++ b/src/de/steamwar/bungeecore/sql/SchematicType.java @@ -44,7 +44,6 @@ public class SchematicType { List tmpTypes = new LinkedList<>(); Map tmpFromDB = new HashMap<>(); Map tmpFightType = new HashMap<>(); - Map tmpEventType = new HashMap<>(); tmpTypes.add(Normal); tmpFromDB.put(Normal.name().toLowerCase(), Normal); @@ -94,11 +93,6 @@ public class SchematicType { if(checktype != null) tmpFightType.put(checktype, current); tmpFromDB.put(type.toLowerCase(), current); - - Integer eventID = config.get("eventID", null); - if (eventID != null) { - tmpEventType.put(eventID, current); - } } }