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; }