Don't generate InvocationExceptions that don't go to the client; silently ignore requests made after timeouts, generate warnings for other invalid requests.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3543 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java

@@ -26,13 +26,13 @@ import java.util.Arrays;
 
 import com.samskivert.util.ArrayUtil;
 import com.samskivert.util.Interval;
+import com.samskivert.util.StringUtil;
 
 import com.threerings.util.Name;
 import com.threerings.util.RandomUtil;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.DObject;
-import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.PresentsServer;
 
 import com.threerings.crowd.data.BodyObject;
@@ -218,17 +218,22 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
      */
     public void sendCardsToPlayer (ClientObject client, int toidx,
         Card[] cards)
-        throws InvocationException
     {
         // make sure they're actually a player
         int fromidx = _cgmgr.getPlayerIndex(client);
         if (fromidx == -1) {
-            throw new InvocationException("m.not_playing");
+            Log.warning("Send request from non-player [username=" +
+                ((BodyObject)client).username + ", cards=" +
+                StringUtil.toString(cards) + "].");
+            return;
         }
         
         // make sure they have the cards
         if (!_hands[fromidx].containsAll(cards)) {
-            throw new InvocationException("m.not_holding_card");
+            Log.warning("Tried to send cards not held [username=" +
+                ((BodyObject)client).username + ", cards=" +
+                StringUtil.toString(cards) + "].");
+            return;
         }
         
         // send the cards
@@ -255,27 +260,32 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
     
     // Documentation inherited.
     public void playCard (ClientObject client, Card card)
-        throws InvocationException
     {
         // make sure we're playing a trick
         if (_trickCardGame.getTrickState() !=
             TrickCardGameObject.PLAYING_TRICK) {
-            throw new InvocationException("not_playing_trick");
+            return; // silently ignore play attempts after timeouts
         }
         
         // make sure it's their turn
         Name username = ((BodyObject)client).username;
-        verifyPlayersTurn(username);
+        if (!username.equals(_trickCardGame.getTurnHolder())) {
+            return;
+        }
         
         // make sure their hand contains the specified card
         int pidx = _cardGame.getPlayerIndex(username);
         if (!_hands[pidx].contains(card)) {
-            throw new InvocationException("m.not_holding_card");
+            Log.warning("Tried to play card not held [username=" + username +
+                ", card=" + card + "].");
+            return;
         }
         
         // make sure the card is legal to play
         if (!_trickCardGame.isCardPlayable(_hands[pidx], card)) {
-            throw new InvocationException("m.card_not_playable");
+            Log.warning("Tried to play illegal card [username=" + username +
+                ", card=" + card + "].");
+            return;
         }
         
         // play the card
@@ -315,23 +325,28 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
     
     // Documentation inherited.
     public void requestRematch (ClientObject client)
-        throws InvocationException
     {
         // make sure the game is over
         if (_cardGame.state != CardGameObject.GAME_OVER) {
-            throw new InvocationException("m.game_not_over");
+            Log.warning("Tried to request rematch when game wasn't over " +
+                "[username=" + ((BodyObject)client).username + "].");
+            return;
         }
         
         // make sure the requester is one of the players
         int pidx = _cgmgr.getPlayerIndex(client);
         if (pidx == -1) {
-            throw new InvocationException("m.not_playing");
+            Log.warning("Rematch request from non-player [username=" +
+                ((BodyObject)client).username + "].");
+            return;
         }
         
         // make sure the player hasn't already requested
         if (_trickCardGame.getRematchRequests()[pidx] !=
             TrickCardGameObject.NO_REQUEST) {
-            throw new InvocationException("m.already_requested");
+            Log.warning("Repeated rematch request [username=" +
+                ((BodyObject)client).username + "].");
+            return;
         }
         
         // if player is first requesting, set to request; else set
@@ -373,18 +388,6 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
             _cardGame.getPlayerCount();
     }
     
-    /**
-     * Throws an {@link InvocationException} if it is not the specified
-     * user's turn.
-     */
-    protected void verifyPlayersTurn (Name username)
-        throws InvocationException
-    {
-        if (!username.equals(_trickCardGame.getTurnHolder())) {
-            throw new InvocationException("m.not_your_turn");
-        }
-    }
-    
     // Documentation inherited.
     protected void setFirstTurnHolder ()
     {

src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java

@@ -22,8 +22,7 @@ public interface TrickCardGameProvider extends InvocationProvider
      * @param cards the cards to send
      */
     public void sendCardsToPlayer (ClientObject client, int toidx,
-        Card[] cards)
-        throws InvocationException;
+        Card[] cards);
     
     /**
      * Plays a card in the trick.
@@ -31,14 +30,12 @@ public interface TrickCardGameProvider extends InvocationProvider
      * @param client the client object
      * @param card the card to play
      */
-    public void playCard (ClientObject client, Card card)
-        throws InvocationException;
+    public void playCard (ClientObject client, Card card);
         
     /**
      * Processes a request for a rematch.
      *
      * @param client the client object
      */
-    public void requestRematch (ClientObject client)
-        throws InvocationException;
+    public void requestRematch (ClientObject client);
 }