From d93c26f158ba7a02c6a45b04eb352d6d377cb1ad Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <andrzej@threerings.net>
Date: Sat, 16 Apr 2005 03:41:08 +0000
Subject: [PATCH] Fixed NPE in TrickCardGameManagerDelegate, changed comment.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3497 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../card/trick/server/TrickCardGameManagerDelegate.java       | 2 +-
 .../threerings/parlor/card/trick/util/TrickCardGameUtil.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
index df5c45fe1..1860548a8 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
@@ -338,7 +338,7 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
     protected void verifyPlayersTurn (Name username)
         throws InvocationException
     {
-        if (!_trickCardGame.getTurnHolder().equals(username)) {
+        if (!username.equals(_trickCardGame.getTurnHolder()) {
             throw new InvocationException("m.not_your_turn");
         }
     }
diff --git a/src/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java b/src/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java
index 02bfb859e..962bad509 100644
--- a/src/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java
+++ b/src/java/com/threerings/parlor/card/trick/util/TrickCardGameUtil.java
@@ -81,9 +81,9 @@ public class TrickCardGameUtil
      */
     public static int getNextInClockwiseSequence (int pidx)
     {
-        //   0
-        // 3   1
         //   2
+        // 1   3
+        //   0
         return (pidx + 1) & 3;
     }