From 448829e09658c147e40a2f7933c8b6f4f956230a Mon Sep 17 00:00:00 2001 From: Major- Date: Fri, 27 Jun 2014 17:01:50 +0100 Subject: [PATCH] Fix bug where players would not be added to the username map. --- src/org/apollo/game/model/World.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/org/apollo/game/model/World.java b/src/org/apollo/game/model/World.java index 54c582de..0fd61ffc 100644 --- a/src/org/apollo/game/model/World.java +++ b/src/org/apollo/game/model/World.java @@ -328,9 +328,12 @@ public final class World { return RegistrationStatus.ALREADY_ONLINE; } - boolean success = playerRepository.add(player) - && players.put(NameUtil.encodeBase37(player.getUsername().toLowerCase()), player) == null; + boolean success = playerRepository.add(player); if (success) { + if (players.put(NameUtil.encodeBase37(player.getUsername().toLowerCase()), player) != null) { + logger.info("Error adding the player to the username map - someone with that name already exists."); + return RegistrationStatus.ALREADY_ONLINE; + } logger.info("Registered player: " + player + " [count=" + playerRepository.size() + "]"); Sector sector = sectorRepository.get(SectorCoordinates.fromPosition(player.getPosition())); @@ -383,4 +386,4 @@ public final class World { } } -} +} \ No newline at end of file