refactor: fixed potential game freeze in some infinite cycles, disconnects and top library's card usage (related to #11285);

Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java

@@ -149,45 +149,27 @@ public enum ServerMessagesUtil {
     }
 
     public void incGamesStarted() {
-        int value;
+        gamesStarted.incrementAndGet();
-        do {
-            value = gamesStarted.get();
-        } while (!gamesStarted.compareAndSet(value, value + 1));
     }
 
     public void incGamesEnded() {
-        int value;
+        gamesEnded.incrementAndGet();
-        do {
-            value = gamesEnded.get();
-        } while (!gamesEnded.compareAndSet(value, value + 1));
     }
 
     public void incTournamentsStarted() {
-        int value;
+        tournamentsStarted.incrementAndGet();
-        do {
-            value = tournamentsStarted.get();
-        } while (!tournamentsStarted.compareAndSet(value, value + 1));
     }
 
     public void incTournamentsEnded() {
-        int value;
+        tournamentsEnded.incrementAndGet();
-        do {
-            value = tournamentsEnded.get();
-        } while (!tournamentsEnded.compareAndSet(value, value + 1));
     }
 
     public void incReconnects() {
-        int value;
+        reconnects.incrementAndGet();
-        do {
-            value = reconnects.get();
-        } while (!reconnects.compareAndSet(value, value + 1));
     }
 
     public void incLostConnection() {
-        int value;
+        lostConnection.incrementAndGet();
-        do {
-            value = lostConnection.get();
-        } while (!lostConnection.compareAndSet(value, value + 1));
     }
 
 }

Mage.Sets/src/mage/cards/g/GoldberryRiverDaughter.java

@@ -151,7 +151,7 @@ class GoldberryRiverDaughterToEffect extends OneShotEffect {
                     max, MultiAmountType.COUNTERS, game);
 
             total = choices.stream().reduce(0, Integer::sum);
-        } while (total < 1);
+        } while (total < 1 && controller.canRespond());
 
         // Move the counters. Make sure some counters were actually moved.
         boolean movedCounters = false;

Mage.Sets/src/mage/cards/m/MagesContest.java

@@ -90,7 +90,7 @@ class MagesContestEffect extends OneShotEffect {
                             break;
                         }
                     }
-                } while (!Objects.equals(currentPlayer, winner));
+                } while (you.canRespond() && spellController.canRespond() && !Objects.equals(currentPlayer, winner));
                 game.informPlayers(winner.getLogName() + " has won the contest with a high bid of " + highBid + " life");
                 winner.loseLife(highBid, game, source, false);
                 if (winner == you) {

Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java

@@ -162,9 +162,11 @@ class NicolBolasGodPharaohPlusTwoEffect extends OneShotEffect {
         do {
             card = library.getFromTop(game);
             if (card == null) {
-                continue;
+                break;
+            }
+            if (!opponent.moveCards(card, Zone.EXILED, source, game)) {
+                break;
             }
-            opponent.moveCards(card, Zone.EXILED, source, game);
             if (card.isLand(game)) {
                 continue;
             }
@@ -172,8 +174,7 @@ class NicolBolasGodPharaohPlusTwoEffect extends OneShotEffect {
             effect.setTargetPointer(new FixedTarget(card, game));
             game.addEffect(effect, source);
             break;
-        } while (library.hasCards()
+        } while (library.hasCards());
-                && card != null);
         return true;
     }
 }

Mage.Sets/src/mage/cards/p/PossibilityStorm.java

@@ -129,10 +129,14 @@ class PossibilityStormEffect extends OneShotEffect {
         Card card;
         do {
             card = library.getFromTop(game);
-            if (card != null) {
+            if (card == null) {
-                spellController.moveCardsToExile(card, source, game, true, source.getSourceId(), sourceObject.getIdName());
+                break;
             }
-        } while (library.hasCards() && card != null && !sharesType(card, spell.getCardType(game), game));
+
+            if (!spellController.moveCardsToExile(card, source, game, true, source.getSourceId(), sourceObject.getIdName())) {
+                break;
+            };
+        } while (library.hasCards() && !sharesType(card, spell.getCardType(game), game));
 
         if (card != null && sharesType(card, spell.getCardType(game), game)
                 && !card.isLand(game)

Mage.Sets/src/mage/cards/p/PrimalSurge.java

@@ -59,19 +59,21 @@ class PrimalSurgeEffect extends OneShotEffect {
             return false;
         }
 
-        boolean repeat;
         do {
-            repeat = false;
             Card card = controller.getLibrary().getFromTop(game);
-            if (card != null) {
+            if (card == null) {
-                controller.moveCards(card, Zone.EXILED, source, game);
+                break;
-                if (card.isPermanent(game)
-                        && controller.chooseUse(Outcome.PutCardInPlay, "Put " + card.getName() + " onto the battlefield?", source, game)) {
-                    controller.moveCards(card, Zone.BATTLEFIELD, source, game);
-                    repeat = true;
-                }
             }
-        } while (controller.canRespond() && repeat);
+            if (!controller.moveCards(card, Zone.EXILED, source, game)) {
+                break;
+            }
+            if (card.isPermanent(game)
+                    && controller.chooseUse(Outcome.PutCardInPlay, "Put " + card.getName() + " onto the battlefield?", source, game)) {
+                controller.moveCards(card, Zone.BATTLEFIELD, source, game);
+                continue;
+            }
+            break;
+        } while (controller.canRespond());
 
         return true;
     }

Mage.Sets/src/mage/cards/r/ResourcefulDefense.java

@@ -109,7 +109,7 @@ class ResourcefulDefenseMoveCounterEffect extends OneShotEffect {
                     max, MultiAmountType.COUNTERS, game);
 
             total = choices.stream().reduce(0, Integer::sum);
-        } while (total < 0);
+        } while (total < 0 && controller.canRespond());
 
         // Move the counters. Make sure some counters were actually moved.
         for (int i = 0; i < choices.size(); i++) {

Mage.Sets/src/mage/cards/r/Ricochet.java

@@ -1,4 +1,3 @@
-
 package mage.cards.r;
 
 import java.util.Collections;
@@ -114,6 +113,8 @@ class RicochetEffect extends OneShotEffect {
                     playerRolls.put(player, 7);
                 }
             }
+
+            // roll until only 1 min result
             do {
                 for (Player player : playerRolls.keySet()) {
                     playerRolls.put(player, player.rollDice(Outcome.Detriment, source, game, 6)); // bad outcome - ai must choose lowest value

Mage.Sets/src/mage/cards/s/StolenGoods.java

@@ -66,15 +66,17 @@ class StolenGoodsEffect extends OneShotEffect {
         do {
             card = opponent.getLibrary().getFromTop(game);
             if (card == null) {
-                continue;
+                break;
             }
             if (card.isLand(game)) {
-                opponent.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null));
+                if (!opponent.moveCardsToExile(card, source, game, true, source.getSourceId(), CardUtil.createObjectRealtedWindowTitle(source, game, null))) {
+                    break;
+                }
             } else {
                 PlayFromNotOwnHandZoneTargetEffect.exileAndPlayFromExile(game, source, card, TargetController.YOU, Duration.EndOfTurn, true, false, true);
                 break;
             }
-        } while (card != null && card.isLand(game));
+        } while (card.isLand(game));
 
         return true;
     }

Mage.Sets/src/mage/cards/s/SuntailSquadron.java

@@ -60,7 +60,9 @@ class SuntailSquadronEffect extends OneShotEffect {
         }
         Effect effect = new ConjureCardEffect("Suntail Hawk");
         do {
-            effect.apply(game, source);
+            if (!effect.apply(game, source)) {
+                break;
+            }
         } while (player.getHand().size() < 7);
         return true;
     }

Mage.Sets/src/mage/cards/t/Timesifter.java

@@ -63,7 +63,7 @@ class TimesifterEffect extends OneShotEffect {
         List<UUID> playersExiling = game.getState().getPlayersInRange(source.getControllerId(), game);
         do {
             int highestCMC = Integer.MIN_VALUE;
-            List<UUID> playersWithHighestCMC = new ArrayList<>(1);
+            List<UUID> playersWithHighestCMC = new ArrayList<>();
             for (UUID playerId : playersExiling) {
                 Player player = game.getPlayer(playerId);
                 if (player != null) {
@@ -84,6 +84,7 @@ class TimesifterEffect extends OneShotEffect {
             }
             playersExiling = new ArrayList<>(playersWithHighestCMC);
         } while (playersExiling.size() > 1);
+
         for (UUID playerId : playersExiling) {
             Effect effect = new AddExtraTurnTargetEffect();
             effect.setTargetPointer(new FixedTarget(playerId));