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

gui: fixed some errors on table/game close from server side (related to #13844)

Browse source
This commit is contained in:
Oleg Agafonov 2025-07-12 13:52:50 +04:00
parent 1535485c2d
commit c9734ce0b2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage.Common/src/main/java/mage/remote/SessionImpl.java
View file

@ -723,7 +723,7 @@ public class SessionImpl implements Session {
public Optional<UUID> getRoomChatId(UUID roomId) { public Optional<UUID> getRoomChatId(UUID roomId) {
try { try {
if (isConnected()) { if (isConnected()) {
return Optional.of(server.chatFindByRoom(roomId)); return Optional.ofNullable(server.chatFindByRoom(roomId));
} }
} catch (MageException ex) { } catch (MageException ex) {
handleMageException(ex); handleMageException(ex);
@ -735,7 +735,7 @@ public class SessionImpl implements Session {
public Optional<UUID> getTableChatId(UUID tableId) { public Optional<UUID> getTableChatId(UUID tableId) {
try { try {
if (isConnected()) { if (isConnected()) {
return Optional.of(server.chatFindByTable(tableId)); return Optional.ofNullable(server.chatFindByTable(tableId));
} }
} catch (MageException ex) { } catch (MageException ex) {
handleMageException(ex); handleMageException(ex);
@ -747,7 +747,7 @@ public class SessionImpl implements Session {
public Optional<UUID> getGameChatId(UUID gameId) { public Optional<UUID> getGameChatId(UUID gameId) {
try { try {
if (isConnected()) { if (isConnected()) {
return Optional.of(server.chatFindByGame(gameId)); return Optional.ofNullable(server.chatFindByGame(gameId));
} }
} catch (MageException ex) { } catch (MageException ex) {
handleMageException(ex); handleMageException(ex);
@ -761,7 +761,7 @@ public class SessionImpl implements Session {
public Optional<TableView> getTable(UUID roomId, UUID tableId) { public Optional<TableView> getTable(UUID roomId, UUID tableId) {
try { try {
if (isConnected()) { if (isConnected()) {
return Optional.of(server.roomGetTableById(roomId, tableId)); return Optional.ofNullable(server.roomGetTableById(roomId, tableId));
} }
} catch (MageException ex) { } catch (MageException ex) {
handleMageException(ex); handleMageException(ex);
@ -905,7 +905,7 @@ public class SessionImpl implements Session {
public Optional<UUID> getTournamentChatId(UUID tournamentId) { public Optional<UUID> getTournamentChatId(UUID tournamentId) {
try { try {
if (isConnected()) { if (isConnected()) {
return Optional.of(server.chatFindByTournament(tournamentId)); return Optional.ofNullable(server.chatFindByTournament(tournamentId));
} }
} catch (MageException ex) { } catch (MageException ex) {
handleMageException(ex); handleMageException(ex);