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

Fix NPE

Browse Source
This commit is contained in:
Xephi59 2015-07-14 05:05:16 +02:00
parent 7f7b713e67
commit 3fe1c4edae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/fr/xephi/authme/AuthMe.java
View File

@ -543,8 +543,8 @@ public class AuthMe extends JavaPlugin {
Location spawnLoc = world.getSpawnLocation(); Location spawnLoc = world.getSpawnLocation();
for (int i = spawnPriority.length - 1; i >= 0; i--) { for (int i = spawnPriority.length - 1; i >= 0; i--) {
String s = spawnPriority[i]; String s = spawnPriority[i];
if (s.equalsIgnoreCase("default") && getDefaultSpawn() != null) if (s.equalsIgnoreCase("default") && getDefaultSpawn(world) != null)
spawnLoc = getDefaultSpawn(); spawnLoc = getDefaultSpawn(world);
if (s.equalsIgnoreCase("multiverse") && getMultiverseSpawn(world) != null) if (s.equalsIgnoreCase("multiverse") && getMultiverseSpawn(world) != null)
spawnLoc = getMultiverseSpawn(world); spawnLoc = getMultiverseSpawn(world);
if (s.equalsIgnoreCase("essentials") && getEssentialsSpawn() != null) if (s.equalsIgnoreCase("essentials") && getEssentialsSpawn() != null)
@ -557,8 +557,8 @@ public class AuthMe extends JavaPlugin {
return spawnLoc; return spawnLoc;
} }
private Location getDefaultSpawn() { private Location getDefaultSpawn(World world) {
return this.getServer().getWorld(Settings.defaultWorld).getSpawnLocation(); return world.getSpawnLocation();
} }
private Location getMultiverseSpawn(World world) { private Location getMultiverseSpawn(World world) {