Merge remote-tracking branch 'origin/escrow'

xdnw · Aug 8, 2023 · 24660c4 · 24660c4
2 parents 5c61b6d + ea84490
commit 24660c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/BankCommands.java b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/BankCommands.java
@@ -2661,6 +2661,9 @@ public static String transferBulkWithErrors(@Me IMessageIO io, @Me JSONObject co
             IMessageBuilder msg = io.create();
             desc.append("Total: `" + PnwUtil.resourcesToString(totalRss) + "`\n");
             desc.append("Note: `" + depositType + "`\n\n");
+            if (escrow_mode != null && escrow_mode != EscrowMode.NEVER) {
+                desc.append("Escrow Mode: `" + escrow_mode + "`\n");
+            }
             sheet.getSheet().attach(msg, desc, true, desc.length());
 
             key = UUID.randomUUID();

diff --git a/src/main/java/link/locutus/discord/db/handlers/ActiveWarHandler.java b/src/main/java/link/locutus/discord/db/handlers/ActiveWarHandler.java
@@ -247,7 +247,7 @@ public void addBlockade(int attacker, int defender, long date, Consumer<Event> e
     }
 
     public void removeBlockade(int attacker, int defender, long date, Consumer<Event> eventConsumer) {
-        List<Event> events = null;
+        Event event = null;
         synchronized (blockadeLock) {
             // remove from both maps, only if the date >= existing date
             Map<Integer, Long> defenders = blockaderToDefender.get(attacker);
@@ -262,15 +262,14 @@ public void removeBlockade(int attacker, int defender, long date, Consumer<Event
                         if (defenderMap.isEmpty()) {
                             defenderToBlockader.remove(defender);
                             if (eventConsumer != null) {
-                                events = new LinkedList<>();
-                                events.add(new NationBlockadedEvent(defender, attacker));
+                                event = new NationUnblockadedEvent(defender, attacker);
                             }
                         }
                     }
                 }
             }
         }
-        if (events != null) events.forEach(eventConsumer);
+        if (event != null) eventConsumer.accept(event);
     }
 
     public void syncBlockades() {