Clean up

Author: tool4EvEr

forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java

@@ -343,7 +343,7 @@ public void update(final boolean fullUpdate) {
 
         final boolean allowNetworking = lobby.isAllowNetworking();
 
-        ImmutableList<VariantCheckBox> vntBoxes = null;
+        ImmutableList<VariantCheckBox> vntBoxes;
         if (allowNetworking) {
             vntBoxes = vntBoxesNetwork;
         } else {
@@ -1209,10 +1209,6 @@ public void onDraftAutoPicked(int seatIndex, PaperCard card, int packNumber, int
         controller.onDraftAutoPicked(seatIndex, card, packNumber, pickInPack);
     }
 
-    public void cancelActiveDraft() {
-        controller.cancelActiveDraft();
-    }
-
     @Override
     public void onReceiveEventPool(String eventId, Deck pool) {
         controller.onReceiveEventPool(eventId, pool);

forge-gui-desktop/src/main/java/forge/screens/home/online/VSubmenuOnlineLobby.java

@@ -238,7 +238,7 @@ public boolean onClosing(final FScreen screen) {
             if (SOptionPane.showConfirmDialog(Localizer.getInstance().getMessage("lblLeaveLobbyDescription"), Localizer.getInstance().getMessage("lblLeave"))) {
                 server.stopServer();
                 FNetOverlay.SINGLETON_INSTANCE.reset();
-                if (lobby != null) lobby.cancelActiveDraft();
+                if (lobby != null) lobby.getController().cancelActiveDraft();
                 return true;
             }
         } else if (client == null || SOptionPane.showConfirmDialog(Localizer.getInstance().getMessage("lblLeaveLobbyConfirm"), Localizer.getInstance().getMessage("lblLeave"))) {
@@ -247,7 +247,7 @@ public boolean onClosing(final FScreen screen) {
                 client = null;
             }
             FNetOverlay.SINGLETON_INSTANCE.reset();
-            if (lobby != null) lobby.cancelActiveDraft();
+            if (lobby != null) lobby.getController().cancelActiveDraft();
             return true;
         }
         return false;

forge-gui/src/main/java/forge/gamemodes/net/NetConnectUtil.java

@@ -42,7 +42,7 @@ private static abstract class DraftForwardingLobbyListener implements ILobbyList
         }
 
         @Override
-        public void draftPackArrived(int seatIndex, java.util.List<forge.item.PaperCard> pack,
+        public void draftPackArrived(int seatIndex, List<forge.item.PaperCard> pack,
                 int packNumber, int pickNumber, int timerDurationSeconds) {
             view.onDraftPackArrived(seatIndex, pack, packNumber, pickNumber, timerDurationSeconds);
         }

forge-gui/src/main/java/forge/gamemodes/net/draft/BoosterDraftHost.java

@@ -120,8 +120,13 @@ public void start() {
      */
     public synchronized void shutdown() {
         finished = true;
-        cancelAllSeatTimers();
-        cancelAllGraceTimers();
+        for (Integer seatIndex : new ArrayList<>(seatTimers.keySet())) {
+            cancelSeatTimer(seatIndex);
+        }
+        for (ScheduledFuture<?> f : graceTimers.values()) {
+            if (f != null) f.cancel(false);
+        }
+        graceTimers.clear();
         timerExecutor.shutdown();
     }
 
@@ -322,10 +327,7 @@ private int[] computeQueueDepths() {
      * the monitor; the actual network dispatch happens after release.
      */
     private void addFinishDraft(List<Runnable> dispatches) {
-        finished = true;
-        cancelAllSeatTimers();
-        cancelAllGraceTimers();
-        timerExecutor.shutdown();
+        shutdown();
         draft.postDraftActions();
         netLog.info("Draft complete — distributing pools");
 
@@ -361,12 +363,6 @@ private void cancelSeatTimer(int seatIndex) {
         if (f != null) f.cancel(false);
     }
 
-    private void cancelAllSeatTimers() {
-        for (Integer seatIndex : new ArrayList<>(seatTimers.keySet())) {
-            cancelSeatTimer(seatIndex);
-        }
-    }
-
     // --- Disconnect / reconnect handling ---
 
     /**
@@ -464,13 +460,6 @@ private void cancelGraceTimer(int seatIndex) {
         if (f != null) f.cancel(false);
     }
 
-    private void cancelAllGraceTimers() {
-        for (ScheduledFuture<?> f : graceTimers.values()) {
-            if (f != null) f.cancel(false);
-        }
-        graceTimers.clear();
-    }
-
     private void addBroadcastDisconnect(List<Runnable> dispatches, int seatIndex) {
         EventParticipant participant = EventParticipant.findBySeat(participants, seatIndex);
         if (participant == null) return;

forge-gui/src/main/java/forge/gamemodes/net/server/ServerGameLobby.java

@@ -215,7 +215,6 @@ public synchronized void clearCurrentEvent() {
      */
     public synchronized void populateParticipants() {
         NetworkEvent event = getCurrentEvent();
-        if (event == null) return;
         if (event.getPhase() != EventPhase.LOBBY_GATHER) {
             throw new IllegalStateException("populateParticipants only valid in LOBBY_GATHER, not " + event.getPhase());
         }
@@ -239,7 +238,6 @@ public synchronized void populateParticipants() {
      */
     public synchronized void fillRemainingWithAI(int targetSize) {
         NetworkEvent event = getCurrentEvent();
-        if (event == null) return;
         int currentSize = event.getParticipants().size();
         for (int i = currentSize; i < targetSize; i++) {
             String aiName = "Seat " + (i + 1);
@@ -253,7 +251,6 @@ public synchronized void fillRemainingWithAI(int targetSize) {
      */
     public synchronized void shuffleSeatPositions() {
         NetworkEvent event = getCurrentEvent();
-        if (event == null) return;
         List<EventParticipant> participants = event.getParticipants();
         List<Integer> seats = new ArrayList<>();
         for (EventParticipant p : participants) {