This commit is contained in:
Gabriele C
2017-10-23 08:36:49 +02:00
parent cd85c51fbe
commit 39647013b2
5 changed files with 10 additions and 22 deletions
@@ -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.
*