Merge pull request #36 from 9ikj/main

补全仲裁
KingPrimes · Jul 3, 2024 · 18b4951 · 18b4951
2 parents d48b6bc + 3930203
commit 18b4951
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/com/nyx/bot/utils/CacheUtils.java b/src/main/java/com/nyx/bot/utils/CacheUtils.java
@@ -43,12 +43,16 @@ public static void setGlobalState(GlobalStates state) {
                         .findFirst().orElse(null);
                 if (arbitrationPre != null){
                     GlobalStates.Arbitration arbitration = new GlobalStates.Arbitration();
-                    arbitration.setNode(arbitrationPre.getNode()+" ("+arbitrationPre.getPlanet()+")");
-                    arbitration.setType(arbitrationPre.getType());
-                    arbitration.setEnemy(arbitrationPre.getEnemy());
+                    arbitration.setActivation(arbitrationPre.getActivation());
                     LocalDateTime localDateTime = LocalDateTime.ofInstant(arbitrationPre.getActivation().toInstant(), ZoneOffset.ofHours(8));
                     Instant instant = localDateTime.plusHours(1).toInstant(ZoneOffset.ofHours(8));
                     arbitration.setExpiry(Date.from(instant));
+                    arbitration.setNode(arbitrationPre.getNode()+" ("+arbitrationPre.getPlanet()+")");
+                    arbitration.setType(arbitrationPre.getType());
+                    arbitration.setEnemy(arbitrationPre.getEnemy());
+                    arbitration.setArchwing(false);
+                    arbitration.setSharkwing(false);
+                    arbitration.setEtc(DateUtils.getDiff(Date.from(instant), new Date(), true));
                     state.setArbitration(arbitration);
                 }
             }