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
@@ -36,6 +36,7 @@ import net.kyori.text.Component;
import net.kyori.text.serializer.ComponentSerializers;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.chat.ComponentSerializer;
import java.util.UUID;
@@ -67,7 +68,7 @@ public class BungeeSenderFactory extends SenderFactory<CommandSender> {
@Override
protected void sendMessage(CommandSender sender, Component message) {
sender.sendMessage(net.md_5.bungee.chat.ComponentSerializer.parse(ComponentSerializers.JSON.serialize(message)));
sender.sendMessage(ComponentSerializer.parse(ComponentSerializers.JSON.serialize(message)));
}
@Override
@@ -166,10 +166,9 @@ public class LPBungeeBootstrap extends Plugin implements LuckPermsBootstrap {
return getResourceAsStream(path);
}
@Nullable
@Override
public ProxiedPlayer getPlayer(UUID uuid) {
return getProxy().getPlayer(uuid);
public Optional<ProxiedPlayer> getPlayer(UUID uuid) {
return Optional.ofNullable(getProxy().getPlayer(uuid));
}
@Override
@@ -179,11 +179,7 @@ public class LPBungeePlugin extends AbstractLuckPermsPlugin {
@Override
public Optional<Contexts> getContextForUser(User user) {
ProxiedPlayer 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