Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#862 Check that LimboPlayer is not null on login (TeleportationService)

Browse Source
This commit is contained in:
ljacqu 2016-07-20 19:10:27 +02:00
parent 3487386840
commit 86df740491
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/fr/xephi/authme/util/TeleportationService.java
View File

@ -1,5 +1,6 @@
package fr.xephi.authme.util; package fr.xephi.authme.util;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.cache.limbo.PlayerData; import fr.xephi.authme.cache.limbo.PlayerData;
@ -109,7 +110,7 @@ public class TeleportationService implements Reloadable {
} }
// #856: If PlayerData comes from a persisted file, the Location might be null // #856: If PlayerData comes from a persisted file, the Location might be null
String worldName = (limbo.getLocation() != null) String worldName = (limbo != null && limbo.getLocation() != null)
? limbo.getLocation().getWorld().getName() ? limbo.getLocation().getWorld().getName()
: null; : null;
@ -120,8 +121,11 @@ public class TeleportationService implements Reloadable {
if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) { if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) {
Location location = buildLocationFromAuth(player, auth); Location location = buildLocationFromAuth(player, auth);
teleportBackFromSpawn(player, location); teleportBackFromSpawn(player, location);
} else if (limbo.getLocation() != null) { } else if (limbo != null && limbo.getLocation() != null) {
teleportBackFromSpawn(player, limbo.getLocation()); teleportBackFromSpawn(player, limbo.getLocation());
} else if (limbo == null) {
// TODO #867: Remove this after investigating why LimboPlayer is null sometimes
ConsoleLogger.warning("LimboPlayer is null for '" + player.getName() + "'");
} }
} }
} }