External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some server NPE fixes

Browse source
This commit is contained in:
magenoxx 2011-10-24 20:48:58 +04:00
parent db30dbd5d6
commit 8983a26e5b
1 changed files with 101 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

153
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -154,8 +154,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TableManager.getInstance().removeTable(userId, tableId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().removeTable(userId, tableId);
}
} }
} }
); );
@ -310,8 +312,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TableManager.getInstance().startMatch(userId, roomId, tableId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().startMatch(userId, roomId, tableId);
}
} }
} }
); );
@ -330,8 +334,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TableManager.getInstance().startChallenge(userId, roomId, tableId, challengeId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().startChallenge(userId, roomId, tableId, challengeId);
}
} }
} }
); );
@ -350,8 +356,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TableManager.getInstance().startTournament(userId, roomId, tableId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().startTournament(userId, roomId, tableId);
}
} }
} }
); );
@ -397,8 +405,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ChatManager.getInstance().joinChat(chatId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ChatManager.getInstance().joinChat(chatId, userId);
}
} }
} }
); );
@ -415,8 +425,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ChatManager.getInstance().leaveChat(chatId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ChatManager.getInstance().leaveChat(chatId, userId);
}
} }
} }
); );
@ -451,8 +463,7 @@ public class MageServerImpl implements MageServer {
@Override @Override
public boolean isTableOwner(String sessionId, UUID roomId, UUID tableId) throws MageException { public boolean isTableOwner(String sessionId, UUID roomId, UUID tableId) throws MageException {
try { try {
Session session = SessionManager.getInstance().getSession(sessionId); if (SessionManager.getInstance().isValidSession(sessionId)) {
if (session != null) {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
return TableManager.getInstance().isTableOwner(tableId, userId); return TableManager.getInstance().isTableOwner(tableId, userId);
} }
@ -471,8 +482,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TableManager.getInstance().swapSeats(tableId, userId, seatNum1, seatNum2); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().swapSeats(tableId, userId, seatNum1, seatNum2);
}
} }
} }
); );
@ -491,8 +504,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
GamesRoomManager.getInstance().getRoom(roomId).leaveTable(userId, tableId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
GamesRoomManager.getInstance().getRoom(roomId).leaveTable(userId, tableId);
}
} }
} }
); );
@ -522,8 +537,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
GameManager.getInstance().joinGame(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
GameManager.getInstance().joinGame(gameId, userId);
}
} }
} }
); );
@ -542,8 +559,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
DraftManager.getInstance().joinDraft(draftId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
DraftManager.getInstance().joinDraft(draftId, userId);
}
} }
} }
); );
@ -562,8 +581,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TournamentManager.getInstance().joinTournament(tournamentId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TournamentManager.getInstance().joinTournament(tournamentId, userId);
}
} }
} }
); );
@ -624,8 +645,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
User user = SessionManager.getInstance().getUser(sessionId); if (SessionManager.getInstance().isValidSession(sessionId)) {
user.sendPlayerString(gameId, data); User user = SessionManager.getInstance().getUser(sessionId);
user.sendPlayerString(gameId, data);
}
} }
} }
); );
@ -644,8 +667,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
User user = SessionManager.getInstance().getUser(sessionId); if (SessionManager.getInstance().isValidSession(sessionId)) {
user.sendPlayerBoolean(gameId, data); User user = SessionManager.getInstance().getUser(sessionId);
user.sendPlayerBoolean(gameId, data);
}
} }
} }
); );
@ -664,8 +689,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
User user = SessionManager.getInstance().getUser(sessionId); if (SessionManager.getInstance().isValidSession(sessionId)) {
user.sendPlayerInteger(gameId, data); User user = SessionManager.getInstance().getUser(sessionId);
user.sendPlayerInteger(gameId, data);
}
} }
} }
); );
@ -698,8 +725,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
GameManager.getInstance().concedeGame(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
GameManager.getInstance().concedeGame(gameId, userId);
}
} }
} }
); );
@ -732,8 +761,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
GameManager.getInstance().watchGame(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
GameManager.getInstance().watchGame(gameId, userId);
}
} }
} }
); );
@ -752,8 +783,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
GameManager.getInstance().stopWatching(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
GameManager.getInstance().stopWatching(gameId, userId);
}
} }
} }
); );
@ -772,8 +805,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ReplayManager.getInstance().replayGame(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ReplayManager.getInstance().replayGame(gameId, userId);
}
} }
} }
); );
@ -792,8 +827,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ReplayManager.getInstance().startReplay(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ReplayManager.getInstance().startReplay(gameId, userId);
}
} }
} }
); );
@ -812,8 +849,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ReplayManager.getInstance().stopReplay(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ReplayManager.getInstance().stopReplay(gameId, userId);
}
} }
} }
); );
@ -832,8 +871,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ReplayManager.getInstance().nextPlay(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ReplayManager.getInstance().nextPlay(gameId, userId);
}
} }
} }
); );
@ -852,8 +893,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ReplayManager.getInstance().previousPlay(gameId, userId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ReplayManager.getInstance().previousPlay(gameId, userId);
}
} }
} }
); );
@ -872,8 +915,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
ReplayManager.getInstance().skipForward(gameId, userId, moves); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
ReplayManager.getInstance().skipForward(gameId, userId, moves);
}
} }
} }
); );
@ -910,8 +955,10 @@ public class MageServerImpl implements MageServer {
@Override @Override
public void run() { public void run() {
if (testMode) { if (testMode) {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
GameManager.getInstance().cheat(gameId, userId, playerId, deckList); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
GameManager.getInstance().cheat(gameId, userId, playerId, deckList);
}
} }
} }
} }
@ -987,8 +1034,10 @@ public class MageServerImpl implements MageServer {
new Runnable() { new Runnable() {
@Override @Override
public void run() { public void run() {
UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId(); if (SessionManager.getInstance().isValidSession(sessionId)) {
TableManager.getInstance().removeTable(userId, tableId); UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
TableManager.getInstance().removeTable(userId, tableId);
}
} }
} }
); );