ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfix for the tournament name spam

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2025-04-16 17:30:49 -05:00
parent 8b872bd835
commit fc24e05caa
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/TableHolder.java
View File

@@ -175,13 +175,20 @@ public class TableHolder {
final GameTable table = tableInformation.getValue();
List<String> players;
if (table.getGameSettings().league() != null)
if (table.getGameSettings().league() != null) {
players = Collections.emptyList();
else
}
else {
players = table.getPlayerNames();
}
if (isAdmin || isNoIgnores(players, player.getName()))
visitor.visitTable(tableInformation.getKey(), null, false, HallInfoVisitor.TableStatus.WAITING, "Waiting", table.getGameSettings().format().getName(), getTournamentName(table), table.getGameSettings().userDescription(), players, table.getPlayerNames().contains(player.getName()), table.getGameSettings().privateGame(), table.getGameSettings().isInviteOnly(), null);
if (isAdmin || isNoIgnores(players, player.getName())) {
visitor.visitTable(tableInformation.getKey(), null, false, HallInfoVisitor.TableStatus.WAITING,
"Waiting", table.getGameSettings().format().getName(), getTournamentName(table),
table.getGameSettings().userDescription(), players,
table.getPlayerNames().contains(player.getName()), table.getGameSettings().privateGame(),
table.getGameSettings().isInviteOnly(), null);
}
}
// Then non-finished
@@ -194,9 +201,19 @@ public class TableHolder {
if (isAdmin || (lotroGameMediator.isVisibleToUser(player.getName()) &&
isNoIgnores(lotroGameMediator.getPlayersPlaying(), player.getName()))) {
if (lotroGameMediator.isFinished())
{
finishedTables.put(runningGame.getKey(), runningTable);
else
visitor.visitTable(runningGame.getKey(), lotroGameMediator.getGameId(), isAdmin || lotroGameMediator.isAllowSpectators(), HallInfoVisitor.TableStatus.PLAYING, lotroGameMediator.getGameStatus(), runningTable.getGameSettings().format().getName(), getTournamentName(runningTable), runningTable.getGameSettings().userDescription(), lotroGameMediator.getPlayersPlaying(), lotroGameMediator.getPlayersPlaying().contains(player.getName()), runningTable.getGameSettings().privateGame(), runningTable.getGameSettings().isInviteOnly(), lotroGameMediator.getWinner());
}
else {
visitor.visitTable(runningGame.getKey(), lotroGameMediator.getGameId(),
isAdmin || lotroGameMediator.isAllowSpectators(), HallInfoVisitor.TableStatus.PLAYING,
lotroGameMediator.getGameStatus(), runningTable.getGameSettings().format().getName(),
getTournamentName(runningTable), runningTable.getGameSettings().userDescription(),
lotroGameMediator.getPlayersPlaying(),
lotroGameMediator.getPlayersPlaying().contains(player.getName()),
runningTable.getGameSettings().privateGame(),
runningTable.getGameSettings().isInviteOnly(), lotroGameMediator.getWinner());
}
if (!lotroGameMediator.isFinished() && lotroGameMediator.getPlayersPlaying().contains(player.getName()))
visitor.runningPlayerGame(lotroGameMediator.getGameId());
@@ -251,7 +268,7 @@ public class TableHolder {
private String getTournamentName(GameTable table) {
final League league = table.getGameSettings().league();
final Tournament tournament = tournamentService.getLiveTournaments().stream().filter(tournament1 -> tournament1.getTournamentId().equals(table.getGameSettings().tournamentId())).findFirst().orElse(null);
final Tournament tournament = null; //tournamentService.getLiveTournaments().stream().filter(tournament1 -> tournament1.getTournamentId().equals(table.getGameSettings().tournamentId())).findFirst().orElse(null);
if (league != null) {
return league.getName() + " - " + table.getGameSettings().leagueSerie().getName();
} else if (tournament != null) {