Skip to content

Commit c80f070

Browse files
committed
show "Ending soon.." rather than negative time
1 parent f93bb4f commit c80f070

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/main/java/lol/hyper/customlauncher/invasiontracker/InvasionTracker.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,19 @@ private void updateInvasionListGUI() {
115115
String district = invasion.getDistrict();
116116
String cogType = invasion.getCogType().replace("\u0003", ""); // remove the python char
117117
String timeLeft;
118+
long timeLeftSeconds;
118119
String cogs;
119120
if (invasion.megaInvasion) {
120121
cogs = "Mega Invasion";
121122
timeLeft = "Mega Invasion";
122123
} else {
123124
cogs = invasion.getCogsDefeated() + "/" + invasion.getCogsTotal();
124-
timeLeft =
125-
convertTime(
126-
ChronoUnit.SECONDS.between(LocalDateTime.now(), invasion.endTime));
125+
timeLeftSeconds = ChronoUnit.SECONDS.between(LocalDateTime.now(), invasion.endTime);
126+
if (timeLeftSeconds <= 0) {
127+
timeLeft = "Ending soon...";
128+
} else {
129+
timeLeft = convertTime(timeLeftSeconds);
130+
}
127131
}
128132
data = new String[] {district, cogType, timeLeft, cogs};
129133
invasionTableModel.addRow(data);

0 commit comments

Comments
 (0)