Add schem deadline message to /event #359
@ -1 +1 @@
|
||||
Subproject commit c96efa9a50ae8c030f4543768239613d5e72be79
|
||||
Subproject commit 492894ca8d41ee0bde4dcb9d520db5f7478c50c7
|
@ -81,7 +81,7 @@ public class EventCommand extends BasicCommand {
|
||||
if(now.isBefore(e.getDeadline().toInstant())) {
|
||||
Message.send("EVENT_COMING_DEADLINE", player, e.getDeadline());
|
||||
}
|
||||
String checkType = e.getCheckType();
|
||||
String checkType = e.getSchemType();
|
||||
if (checkType != null) {
|
||||
SchematicType schematicType = SchematicType.fromDB(checkType);
|
||||
if (schematicType != null && schematicType.deadline() != null && now.isBefore(schematicType.deadline().toInstant())) {
|
||||
|
@ -41,7 +41,7 @@ public class Event {
|
||||
private final boolean publicSchemsOnly;
|
||||
private final boolean spectateSystem;
|
||||
private final Timestamp deadline;
|
||||
private final String checkType;
|
||||
private final String schemType;
|
||||
|
||||
private static Event current = null;
|
||||
|
||||
@ -54,7 +54,7 @@ public class Event {
|
||||
this.publicSchemsOnly = rs.getBoolean("PublicSchemsOnly");
|
||||
this.spectateSystem = rs.getBoolean("SpectateSystem");
|
||||
this.deadline = rs.getTimestamp("Deadline");
|
||||
this.checkType = rs.getString("CheckType");
|
||||
this.schemType = rs.getString("SchemType");
|
||||
|
||||
}
|
||||
|
||||
public static Event get(){
|
||||
@ -125,7 +125,7 @@ public class Event {
|
||||
public Timestamp getDeadline() {
|
||||
return deadline;
|
||||
}
|
||||
public String getCheckType() {
|
||||
return checkType;
|
||||
public String getSchemType() {
|
||||
return schemType;
|
||||
}
|
||||
}
|
||||
|
@ -238,7 +238,7 @@ EVENT_NO_CURRENT=§cThere is no event taking place currently
|
||||
EVENT_COMING=§eUpcoming events§8:
|
||||
EVENT_COMING_EVENT=§7{0}§8-§7{1}§8: §e{2}
|
||||
EVENT_COMING_DEADLINE=§7 Registration deadline§8: §7{0}
|
||||
EVENT_COMING_SCHEM_DEADLINE=§7 Schematic deadline§8: §7{0}
|
||||
EVENT_COMING_SCHEM_DEADLINE=§7 Submission deadline§8: §7{0}
|
||||
Lixfel
hat
Evtl. submission statt schematic? Evtl. submission statt schematic?
|
||||
EVENT_COMING_TEAMS=§7 With§8:{0}
|
||||
EVENT_COMING_TEAM= §{0}{1}
|
||||
EVENT_CURRENT_EVENT=§e§l{0}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren
Können wir das bitte in SchemType umändern? Weil so wie ich das sehe würde die Deadline nicht angezeigt werden (da null) für den Checktype, da die Deadline für den (Haupt-)SchemType gesetzt wird.