From 39647013b27f6681293a8101ef4eb8fe6038758c Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 23 Oct 2017 08:36:49 +0200 Subject: [PATCH] Cleanup --- .../fr/xephi/authme/data/limbo/LimboService.java | 14 ++------------ .../fr/xephi/authme/listener/PlayerListener.java | 2 +- .../java/fr/xephi/authme/process/Management.java | 4 ++-- .../authme/process/join/AsynchronousJoin.java | 10 ++++------ .../xephi/authme/listener/PlayerListenerTest.java | 2 +- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/main/java/fr/xephi/authme/data/limbo/LimboService.java b/src/main/java/fr/xephi/authme/data/limbo/LimboService.java index 034ad89b6..92b405009 100644 --- a/src/main/java/fr/xephi/authme/data/limbo/LimboService.java +++ b/src/main/java/fr/xephi/authme/data/limbo/LimboService.java @@ -50,9 +50,8 @@ public class LimboService { * * @param player the player to process * @param isRegistered whether or not the player is registered - * @param location the desired player location */ - public void createLimboPlayer(Player player, boolean isRegistered, Location location) { + public void createLimboPlayer(Player player, boolean isRegistered) { final String name = player.getName().toLowerCase(); LimboPlayer limboFromDisk = persistence.getLimboPlayer(player); @@ -66,6 +65,7 @@ public class LimboService { ConsoleLogger.debug("LimboPlayer for `{0}` already present in memory", name); } + Location location = spawnLoader.getPlayerLocationOrSpawn(player); LimboPlayer limboPlayer = helper.merge(existingLimbo, limboFromDisk); limboPlayer = helper.merge(helper.createLimboPlayer(player, isRegistered, location), limboPlayer); @@ -78,16 +78,6 @@ public class LimboService { persistence.saveLimboPlayer(player, limboPlayer); } - /** - * Creates a LimboPlayer for the given player and revokes all "limbo data" from the player. - * - * @param player the player to process - * @param isRegistered whether or not the player is registered - */ - public void createLimboPlayer(Player player, boolean isRegistered) { - createLimboPlayer(player, isRegistered, spawnLoader.getPlayerLocationOrSpawn(player)); - } - /** * Returns the limbo player for the given name, or null otherwise. * diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index f80071a7d..8ad4a2fa2 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -198,7 +198,7 @@ public class PlayerListener implements Listener { if (!PlayerListener19Spigot.isPlayerSpawnLocationEventCalled()) { teleportationService.teleportOnJoin(player); } - management.performJoin(player, player.getLocation()); + management.performJoin(player); teleportationService.teleportNewPlayerToFirstSpawn(player); } diff --git a/src/main/java/fr/xephi/authme/process/Management.java b/src/main/java/fr/xephi/authme/process/Management.java index 4f0743ed7..a6eb00057 100644 --- a/src/main/java/fr/xephi/authme/process/Management.java +++ b/src/main/java/fr/xephi/authme/process/Management.java @@ -74,8 +74,8 @@ public class Management { runTask(() -> asynchronousUnregister.adminUnregister(initiator, name, player)); } - public void performJoin(Player player, Location location) { - runTask(() -> asynchronousJoin.processJoin(player, location)); + public void performJoin(Player player) { + runTask(() -> asynchronousJoin.processJoin(player)); } public void performQuit(Player player) { diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index dc66b0b4a..ed63e3ede 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -76,9 +76,8 @@ public class AsynchronousJoin implements AsynchronousProcess { * Processes the given player that has just joined. * * @param player the player to process - * @param location the desired player location, null if you want to use the current one */ - public void processJoin(final Player player, Location location) { + public void processJoin(final Player player) { final String name = player.getName().toLowerCase(); final String ip = PlayerUtils.getPlayerIp(player); @@ -135,7 +134,7 @@ public class AsynchronousJoin implements AsynchronousProcess { return; } - processJoinSync(player, isAuthAvailable, location); + processJoinSync(player, isAuthAvailable); } private void handlePlayerWithUnmetNameRestriction(Player player, String ip) { @@ -153,13 +152,12 @@ public class AsynchronousJoin implements AsynchronousProcess { * * @param player the player to process * @param isAuthAvailable true if the player is registered, false otherwise - * @param location the desired player location, null if you want to use the current one */ - private void processJoinSync(Player player, boolean isAuthAvailable, Location location) { + private void processJoinSync(Player player, boolean isAuthAvailable) { final int registrationTimeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND; bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(() -> { - limboService.createLimboPlayer(player, isAuthAvailable, location); + limboService.createLimboPlayer(player, isAuthAvailable); player.setNoDamageTicks(registrationTimeout); if (pluginHookService.isEssentialsAvailable() && service.getProperty(HooksSettings.USE_ESSENTIALS_MOTD)) { diff --git a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java index 9470e272f..e28311a3f 100644 --- a/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java +++ b/src/test/java/fr/xephi/authme/listener/PlayerListenerTest.java @@ -496,7 +496,7 @@ public class PlayerListenerTest { // then verify(teleportationService).teleportNewPlayerToFirstSpawn(player); - verify(management).performJoin(player, player.getLocation()); + verify(management).performJoin(player); } @Test