External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

added remove table and swap seats methods + combined several message handlers

Browse source
This commit is contained in:
betasteward 2015-06-12 08:40:41 -04:00
parent dcd2907112
commit 8d6716b2a0
37 changed files with 305 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage.Server/src/main/java/mage/server/Main.java
View file

@ -345,16 +345,16 @@ public class Main implements MageServer {
// });
// }
//
// @Override
// public void removeTable(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
@Override
public void removeTable(final String sessionId, final UUID roomId, final UUID tableId) {
// execute("removeTable", sessionId, new Action() {
// @Override
// public void execute() {
// UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// TableManager.getInstance().removeTable(userId, tableId);
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().removeTable(userId, tableId);
// }
// });
// }
}
//
@Override
public boolean joinTable(final String sessionId, final UUID roomId, final UUID tableId, final String name, final String playerType, final int skill, final DeckCardLists deckList, final String password) {
@ -663,16 +663,16 @@ public class Main implements MageServer {
// });
// }
//
// @Override
// public void swapSeats(final String sessionId, final UUID roomId, final UUID tableId, final int seatNum1, final int seatNum2) throws MageException {
@Override
public void swapSeats(final String sessionId, final UUID roomId, final UUID tableId, final int seatNum1, final int seatNum2) {
// execute("swapSeats", sessionId, new Action() {
// @Override
// public void execute() {
// UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
// TableManager.getInstance().swapSeats(tableId, userId, seatNum1, seatNum2);
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().swapSeats(tableId, userId, seatNum1, seatNum2);
// }
// });
// }
}
//
@Override
public boolean leaveTable(final String sessionId, final UUID roomId, final UUID tableId) {