diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java index a5aa662d..de992a0e 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java @@ -92,8 +92,7 @@ public class EventCommand extends SWCommand { sender.system("EVENT_USAGE"); Event currentEvent = Event.get(); - sender.system("EVENT_CURRENT_EVENT", currentEvent.getEventName()); - sendEvent(sender, currentEvent); + eventShowPage(sender, currentEvent, 1); } @Register(value = "show", description = "EVENT_SHOW_USAGE") @@ -141,35 +140,11 @@ public class EventCommand extends SWCommand { } } - private void sendEvent(Chatter sender, Event event) { - - DateTimeFormatter format = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_TIME_FORMAT")); - for (EventFight fight : EventFight.getEvent(event.getEventID())) { - Team blue = Team.byId(fight.getTeamBlue()); - Team red = Team.byId(fight.getTeamRed()); - StringBuilder fline = new StringBuilder(sender.parseToLegacy("EVENT_CURRENT_FIGHT", fight.getStartTime().toLocalDateTime().format(format), blue.getTeamColor(), blue.getTeamKuerzel(), red.getTeamColor(), red.getTeamKuerzel())); - - if (fight.hasFinished()) { - switch (fight.getErgebnis()) { - case 1: - fline.append(sender.parseToLegacy("EVENT_CURRENT_FIGHT_WIN", blue.getTeamColor(), blue.getTeamKuerzel())); - break; - case 2: - fline.append(sender.parseToLegacy("EVENT_CURRENT_FIGHT_WIN", red.getTeamColor(), red.getTeamKuerzel())); - break; - default: - fline.append(sender.parseToLegacy("EVENT_CURRENT_FIGHT_DRAW")); - } - } - - sender.prefixless("PLAIN_STRING", fline.toString()); - } - } - private int sendEventPage(Chatter sender, Event event, int page) { DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_DATE_FORMAT")); Map> dates = EventFight.getEvent(event.getEventID()).stream().collect(Collectors.groupingBy(p -> p.getStartTime().toLocalDateTime().format(dateTimeFormatter))); if (dates.size() >= page) { + sender.system("EVENT_CURRENT_EVENT", event.getEventName()); DateTimeFormatter format = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_TIME_FORMAT")); for (EventFight eventFight : dates.get(dates.keySet().toArray()[page - 1])) { Team blue = Team.byId(eventFight.getTeamBlue());