Fixed NPE in TrickCardGameManagerDelegate, changed comment.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3497 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -338,7 +338,7 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
|
|||||||
protected void verifyPlayersTurn (Name username)
|
protected void verifyPlayersTurn (Name username)
|
||||||
throws InvocationException
|
throws InvocationException
|
||||||
{
|
{
|
||||||
if (!_trickCardGame.getTurnHolder().equals(username)) {
|
if (!username.equals(_trickCardGame.getTurnHolder()) {
|
||||||
throw new InvocationException("m.not_your_turn");
|
throw new InvocationException("m.not_your_turn");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,9 +81,9 @@ public class TrickCardGameUtil
|
|||||||
*/
|
*/
|
||||||
public static int getNextInClockwiseSequence (int pidx)
|
public static int getNextInClockwiseSequence (int pidx)
|
||||||
{
|
{
|
||||||
// 0
|
|
||||||
// 3 1
|
|
||||||
// 2
|
// 2
|
||||||
|
// 1 3
|
||||||
|
// 0
|
||||||
return (pidx + 1) & 3;
|
return (pidx + 1) & 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user