From 6d1b16c9f6cabbd25930740a371b1e1ab906de57 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 20 Feb 2013 00:57:43 +0000 Subject: [PATCH] Fixing issues with sending messages on some browsers. --- .../gempukku/lotro/async/LotroHttpRequestHandler.java | 4 ++++ .../main/java/com/gempukku/lotro/hall/HallServer.java | 8 ++++---- .../lotro/tournament/DailyTournamentPrizes.java | 11 ++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java index 2de019e20..2487a9e7c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java @@ -271,6 +271,10 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler { response.setHeader(CONTENT_TYPE, "application/xml; charset=UTF-8"); length = responseString.length(); + } else { + response.setContent(ChannelBuffers.copiedBuffer("OK", CharsetUtil.UTF_8)); + response.setHeader(CONTENT_TYPE, "text/plain"); + length = 2; } if (keepAlive) { 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 75ae91c77..eb0430146 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 @@ -93,16 +93,16 @@ public class HallServer extends AbstractServer { sdf.setTimeZone(TimeZone.getTimeZone("GMT")); try { - _tournamentQueues.put("fotr_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-15 19:30:00").getTime(), _repeatTournaments, "fotrDailyEu-", "Daily EU Fellowship Block", 0, + _tournamentQueues.put("fotr_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-15 19:30:00").getTime(), _repeatTournaments, "fotrDailyEu-", "Daily Gondor Fellowship Block", 0, true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"), "fotr_block", 8)); - _tournamentQueues.put("fotr_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-16 00:30:00").getTime(), _repeatTournaments, "fotrDailyUs-", "Daily US Fellowship Block", 0, + _tournamentQueues.put("fotr_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-16 00:30:00").getTime(), _repeatTournaments, "fotrDailyUs-", "Daily Rohan Fellowship Block", 0, true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"), "fotr_block", 8)); - _tournamentQueues.put("movie_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-16 19:30:00").getTime(), _repeatTournaments, "movieDailyEu-", "Daily EU Movie Block", 0, + _tournamentQueues.put("movie_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-16 19:30:00").getTime(), _repeatTournaments, "movieDailyEu-", "Daily Gondor Movie Block", 0, true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"), "movie", 8)); - _tournamentQueues.put("movie_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-17 00:30:00").getTime(), _repeatTournaments, "movieDailyUs-", "Daily US Movie Block", 0, + _tournamentQueues.put("movie_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-17 00:30:00").getTime(), _repeatTournaments, "movieDailyUs-", "Daily Rohan Movie Block", 0, true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"), "movie", 8)); } catch (ParseException exp) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java index d7bffc690..82dbc54ad 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java @@ -15,11 +15,12 @@ public class DailyTournamentPrizes implements TournamentPrizes { public CardCollection getPrizeForTournament(PlayerStanding playerStanding, int playersCount) { DefaultCardCollection tournamentPrize = new DefaultCardCollection(); if (playerStanding.getStanding() == 1) { - tournamentPrize.addItem("(S)Booster Choice", 4); + tournamentPrize.addItem("(S)Booster Choice", 8); } else if (playerStanding.getStanding() == 2) { - tournamentPrize.addItem("(S)Booster Choice", 3); - } else if (playerStanding.getStanding() == 3 || - playerStanding.getStanding() == 4) { + tournamentPrize.addItem("(S)Booster Choice", 5); + } else if (playerStanding.getStanding() <=4) { + tournamentPrize.addItem("(S)Booster Choice", 4); + } else if (playerStanding.getStanding()<=8) { tournamentPrize.addItem("(S)Booster Choice", 2); } @@ -35,6 +36,6 @@ public class DailyTournamentPrizes implements TournamentPrizes { @Override public String getPrizeDescription() { - return "
4-3-2-2
"; + return "
8-5-4-2
"; } }