From 0618901a0e5390339b8a2d5f81dc58a62fe25dba Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 2 May 2012 10:27:41 +0000 Subject: [PATCH] Renaming few methods. --- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 8 ++++---- .../java/com/gempukku/lotro/league/LeagueService.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 8dad6b6fe..86e9f42e2 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java index 984d2cf15..faa42c8aa 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java @@ -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 playedInSeason = getPlayerMatchesInSerie(league, season, playerOne); for (LeagueMatch leagueMatch : playedInSeason) { if (playerTwo.equals(leagueMatch.getWinner()) || playerTwo.equals(leagueMatch.getLoser()))