Update WarDB.java

xdnw · Sep 4, 2024 · 14e5096 · 14e5096
1 parent 04730ed
commit 14e5096
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/link/locutus/discord/db/WarDB.java b/src/main/java/link/locutus/discord/db/WarDB.java
@@ -1869,7 +1869,8 @@ public boolean updateWars(List<DBWar> dbWars, Collection<Integer> expectedIds, C
 
         for (DBWar war : dbWars) {
             DBWar existing = warsById.get(war);
-            if ((existing == null && !war.isActive()) || (existing != null && (war.getStatus() == existing.getStatus() || !existing.isActive()))) continue;
+            if ((existing == null && !war.isActive()) || (existing != null && (war.getStatus() == existing.getStatus() ||
+                    (!existing.isActive() && (existing.getStatus() != WarStatus.EXPIRED || existing.getTurnsLeft() <= 0))))) continue;
 
             prevWars.add(existing == null ? null : new DBWar(existing));
             newWars.add(war);