show "Ending soon.." rather than negative time

hyperdefined · Jan 18, 2022 · c80f070 · c80f070
1 parent f93bb4f
commit c80f070
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/lol/hyper/customlauncher/invasiontracker/InvasionTracker.java b/src/main/java/lol/hyper/customlauncher/invasiontracker/InvasionTracker.java
@@ -115,15 +115,19 @@ private void updateInvasionListGUI() {
             String district = invasion.getDistrict();
             String cogType = invasion.getCogType().replace("\u0003", ""); // remove the python char
             String timeLeft;
+            long timeLeftSeconds;
             String cogs;
             if (invasion.megaInvasion) {
                 cogs = "Mega Invasion";
                 timeLeft = "Mega Invasion";
             } else {
                 cogs = invasion.getCogsDefeated() + "/" + invasion.getCogsTotal();
-                timeLeft =
-                        convertTime(
-                                ChronoUnit.SECONDS.between(LocalDateTime.now(), invasion.endTime));
+                timeLeftSeconds = ChronoUnit.SECONDS.between(LocalDateTime.now(), invasion.endTime);
+                if (timeLeftSeconds <= 0) {
+                    timeLeft = "Ending soon...";
+                } else {
+                    timeLeft = convertTime(timeLeftSeconds);
+                }
             }
             data = new String[] {district, cogType, timeLeft, cogs};
             invasionTableModel.addRow(data);