Fix for issue #138.

This should prevent any orphaned IdleOutTasks from being created.
brrr2 · Mar 15, 2014 · 249d8d0 · 249d8d0
1 parent 41bb45b
commit 249d8d0
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 0 deletions.
diff --git a/blackjack/Blackjack.java b/blackjack/Blackjack.java
@@ -280,6 +280,8 @@ protected void bet(String nick, String[] params) {
             informPlayer(nick, getMsg("no_betting"));
         } else if (currentPlayer != findJoined(nick)) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));
         } else {
@@ -305,6 +307,8 @@ protected void allin(String nick, String[] params) {
             informPlayer(nick, getMsg("no_betting"));
         } else if (currentPlayer != findJoined(nick)) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             bet(currentPlayer.get("cash"));
         }
@@ -324,6 +328,8 @@ protected void hit(String nick, String[] params) {
             informPlayer(nick, getMsg("no_cards"));
         } else if (!(currentPlayer == findJoined(nick))) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             hit();
         }
@@ -343,6 +349,8 @@ protected void stand(String nick, String[] params) {
             informPlayer(nick, getMsg("no_cards"));
         } else if (!(currentPlayer == findJoined(nick))) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             stay();
         }
@@ -362,6 +370,8 @@ protected void doubledown(String nick, String[] params) {
             informPlayer(nick, getMsg("no_cards"));
         } else if (!(currentPlayer == findJoined(nick))) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             doubleDown();
         }
@@ -381,6 +391,8 @@ protected void surrender(String nick, String[] params) {
             informPlayer(nick, getMsg("no_cards"));
         } else if (!(currentPlayer == findJoined(nick))) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             surrender();
         }
@@ -400,6 +412,8 @@ protected void insure(String nick, String[] params) {
             informPlayer(nick, getMsg("no_cards"));
         } else if (!(currentPlayer == findJoined(nick))) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));
         } else {
@@ -425,6 +439,8 @@ protected void split(String nick, String[] params) {
             informPlayer(nick, getMsg("no_cards"));
         } else if (!(currentPlayer == findJoined(nick))) {
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             split();
         }
@@ -1389,6 +1405,7 @@ public void endGame() {
     public void resetGame() {
         inProgress = false;
         roundEnded = false;
+        continuingRound = false;
         insuranceBets = false;
         betting = true;
         discardPlayerHand(dealer);
@@ -1675,16 +1692,19 @@ private void split() {
      * Determines what to do when the action falls to a new player/hand
      */
     private void quickEval() {
+        continuingRound = true;
         BlackjackPlayer p = (BlackjackPlayer) currentPlayer;
         if (p.hasSplit()) {
             showTurn(p, p.get("currentindex") + 1);
         } else {
             showTurn(p, 0);
         }
         if (p.has("quit")){
+            continuingRound = false;
             stay();
         } else {
             setIdleOutTask();
+            continuingRound = false;
         }
     }
 

diff --git a/cardgame/CardGame.java b/cardgame/CardGame.java
@@ -62,6 +62,7 @@ public abstract class CardGame extends ListenerAdapter<PircBotX> {
     // Game properties
     protected boolean inProgress;
     protected boolean roundEnded;
+    protected boolean continuingRound;
     protected int startCount;
     protected long lastPing;
     protected String name;

diff --git a/strlib.txt b/strlib.txt
@@ -38,6 +38,7 @@ remove_end_round=You will be removed at the end of the round.
 stop=All remaining auto-starts have been canceled.
 stop_no_autostarts=No auto-starts are scheduled after this round.
 no_manual_start=The next round will automatically begin.
+game_lagging=The game is lagging. Please wait patiently.
 ###################
 # With parameters #
 ###################

diff --git a/texaspoker/TexasPoker.java b/texaspoker/TexasPoker.java
@@ -255,6 +255,8 @@ protected void bet(String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));  
         } else {
@@ -278,6 +280,8 @@ protected void call(String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             call();
         }
@@ -295,6 +299,8 @@ protected void check(String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             check();
         }
@@ -312,6 +318,8 @@ protected void fold(String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             fold();
         }
@@ -329,6 +337,8 @@ protected void raise(String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));
         } else {
@@ -352,6 +362,8 @@ protected void allin(String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             bet(currentPlayer.get("cash"));
         }
@@ -475,6 +487,8 @@ protected void fbet(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));       
         } else {
@@ -499,6 +513,8 @@ protected void fallin(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             bet(currentPlayer.get("cash"));
         }
@@ -517,6 +533,8 @@ protected void fraise(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));        
         } else {
@@ -541,6 +559,8 @@ protected void fcall(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             call();
         }
@@ -559,6 +579,8 @@ protected void fcheck(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             check();
         }
@@ -577,6 +599,8 @@ protected void ffold(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             fold();
         }
@@ -857,6 +881,8 @@ public void startRound() {
 
     @Override
     public void continueRound() {
+        continuingRound = true;
+
         // Store currentPlayer as firstPlayer and find the next player
         Player firstPlayer = currentPlayer;
         currentPlayer = getPlayerAfter(currentPlayer);
@@ -884,6 +910,8 @@ public void continueRound() {
 
             // If all community cards have been dealt, move to end of round
             if (stage == 4){
+                currentPlayer = null;
+                continuingRound = false;
                 endRound();
             // Otherwise, deal community cards
             } else {
@@ -938,6 +966,7 @@ public void continueRound() {
             showMsg(getMsg("tp_turn"), currentPlayer.getNickStr(), currentBet-currentPlayer.get("bet"), 
                         currentPlayer.get("bet"), currentBet, getCashInPlay(), currentPlayer.get("cash")-currentPlayer.get("bet"));
             setIdleOutTask();
+            continuingRound = false;
         }
     }
 
@@ -1072,6 +1101,7 @@ public void resetGame() {
         minRaise = 0;
         inProgress = false;
         roundEnded = false;
+        continuingRound = false;
         discardCommunity();
         currentPot = null;
         pots.clear();

diff --git a/texastourney/TexasTourney.java b/texastourney/TexasTourney.java
@@ -356,6 +356,8 @@ protected void bet(String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));  
         } else {
@@ -375,6 +377,8 @@ protected void call(String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             call();
         }
@@ -388,6 +392,8 @@ protected void check(String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             check();
         }
@@ -401,6 +407,8 @@ protected void fold(String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             fold();
         }
@@ -414,6 +422,8 @@ protected void raise(String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));
         } else {
@@ -433,6 +443,8 @@ protected void allin(String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (findJoined(nick) != currentPlayer){
             informPlayer(nick, getMsg("wrong_turn"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             bet(currentPlayer.get("cash"));
         }
@@ -614,6 +626,8 @@ protected void fbet(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));       
         } else {
@@ -633,6 +647,8 @@ protected void fallin(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             bet(currentPlayer.get("cash"));
         }
@@ -646,6 +662,8 @@ protected void fraise(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else if (params.length < 1){
             informPlayer(nick, getMsg("no_parameter"));
         } else {
@@ -665,6 +683,8 @@ protected void fcall(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             call();
         }
@@ -678,6 +698,8 @@ protected void fcheck(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             check();
         }
@@ -691,6 +713,8 @@ protected void ffold(User user, String nick, String[] params) {
             informPlayer(nick, getMsg("tt_no_start"));
         } else if (currentPlayer == null) {
             informPlayer(nick, getMsg("no_force_play"));
+        } else if (continuingRound) {
+            informPlayer(nick, getMsg("game_lagging"));
         } else {
             fold();
         }
@@ -852,6 +876,8 @@ public void startRound() {
 
     @Override
     public void continueRound() {
+        continuingRound = true;
+
         // Store currentPlayer as firstPlayer and find the next player
         Player firstPlayer = currentPlayer;
         currentPlayer = getPlayerAfter(currentPlayer);
@@ -880,6 +906,8 @@ public void continueRound() {
 
             // If all community cards have been dealt, move to end of round
             if (stage == 4){
+                continuingRound = false;
+                currentPlayer = null;
                 endRound();
             // Otherwise, deal community cards
             } else {
@@ -935,6 +963,7 @@ public void continueRound() {
             showMsg(getMsg("tp_turn"), currentPlayer.getNickStr(), currentBet-currentPlayer.get("bet"), 
                         currentPlayer.get("bet"), currentBet, getCashInPlay(), currentPlayer.get("cash")-currentPlayer.get("bet"));
             setIdleOutTask();
+            continuingRound = false;
         }
     }
 
@@ -1029,6 +1058,7 @@ public void resetGame() {
         currentBet = 0;
         minRaise = 0;
         roundEnded = false;
+        continuingRound = false;
         discardCommunity();
         currentPot = null;
         pots.clear();