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

Renaming few methods.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-05-02 10:27:41 +00:00
parent 980fe7fae0
commit 0618901a0e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -315,16 +315,16 @@ public class HallServer extends AbstractServer {
_awaitingTables.remove(tableId);
}
private void joinTableInternal(String tableId, String playerId, AwaitingTable awaitingTable, String deckName, LotroDeck lotroDeck) throws HallException {
private void joinTableInternal(String tableId, String player, AwaitingTable awaitingTable, String deckName, LotroDeck lotroDeck) throws HallException {
League league = awaitingTable.getLeague();
if (league != null) {
LeagueSerieData leagueSerie = awaitingTable.getLeagueSerie();
if (!_leagueService.canPlayRankedGame(league, leagueSerie, playerId))
if (!_leagueService.canPlayRankedGame(league, leagueSerie, player))
throw new HallException("You have already played max games in league");
if (awaitingTable.getPlayerNames().size() != 0 && !_leagueService.canPlayRankedGame(league, leagueSerie, awaitingTable.getPlayerNames().iterator().next(), playerId))
if (awaitingTable.getPlayerNames().size() != 0 && !_leagueService.canPlayRankedGameAgainst(league, leagueSerie, awaitingTable.getPlayerNames().iterator().next(), player))
throw new HallException("You have already played ranked league game against this player in that series");
}
boolean tableFull = awaitingTable.addPlayer(new LotroGameParticipant(playerId, deckName, lotroDeck));
boolean tableFull = awaitingTable.addPlayer(new LotroGameParticipant(player, deckName, lotroDeck));
if (tableFull)
createGame(tableId, awaitingTable);
}

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java
View File

@@ -420,7 +420,7 @@ public class LeagueService {
return true;
}
public boolean canPlayRankedGame(League league, LeagueSerieData season, String playerOne, String playerTwo) {
public boolean canPlayRankedGameAgainst(League league, LeagueSerieData season, String playerOne, String playerTwo) {
Collection<LeagueMatch> playedInSeason = getPlayerMatchesInSerie(league, season, playerOne);
for (LeagueMatch leagueMatch : playedInSeason) {
if (playerTwo.equals(leagueMatch.getWinner()) || playerTwo.equals(leagueMatch.getLoser()))