Minor misc changes

This commit is contained in:
Luck
2018-04-08 22:58:15 +01:00
Unverified
parent f5c6b9e3d4
commit cb185e4827
16 changed files with 88 additions and 76 deletions
@@ -262,14 +262,13 @@ public class LPSpongeBootstrap implements LuckPermsBootstrap {
return getClass().getClassLoader().getResourceAsStream(path);
}
@Nullable
@Override
public Player getPlayer(UUID uuid) {
public Optional<Player> getPlayer(UUID uuid) {
if (!getGame().isServerAvailable()) {
return null;
return Optional.empty();
}
return getGame().getServer().getPlayer(uuid).orElse(null);
return getGame().getServer().getPlayer(uuid);
}
@Override
@@ -229,11 +229,7 @@ public class LPSpongePlugin extends AbstractLuckPermsPlugin {
@Override
public Optional<Contexts> getContextForUser(User user) {
Player player = this.bootstrap.getPlayer(user.getUuid());
if (player == null) {
return Optional.empty();
}
return Optional.of(this.contextManager.getApplicableContexts(player));
return this.bootstrap.getPlayer(user.getUuid()).map(player -> this.contextManager.getApplicableContexts(player));
}
@Override