AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use error message names that make sense. Differentiate between not allowing

Browse Source 
something because the requester is not the owner of the table and trying to
boot onesself from the table.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@764 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2008-10-23 20:20:14 +00:00
parent 8a76c0de9f
commit 244b9b22b8
3 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/server/TableManager.java
+5 -5
View File
@@ -278,7 +278,7 @@ public class TableManager
if (table == null) {
throw new InvocationException(NO_SUCH_TABLE);
} else if (starter.getOid() != table.bodyOids[0]) {
throw new InvocationException(INVALID_TABLE_POSITION);
throw new InvocationException(MUST_BE_CREATOR);
} else if (!table.mayBeStarted()) {
throw new InvocationException(INTERNAL_ERROR);
}
@@ -302,10 +302,10 @@ public class TableManager
int position = ListUtil.indexOf(table.players, target);
if (position < 0) {
throw new InvocationException(NOT_AT_TABLE);
} else if (booter.getOid() != table.bodyOids[0] ||
booter.getOid() == table.bodyOids[position]) {
// Must be head of the table, and can't self-boot
throw new InvocationException(INVALID_TABLE_POSITION);
} else if (booter.getOid() != table.bodyOids[0]) {
throw new InvocationException(MUST_BE_CREATOR);
} else if (booter.getOid() == table.bodyOids[position]) {
throw new InvocationException(NO_SELF_BOOT);
}
// Remember to keep him banned