Fix NPE on startup (#520)

This commit is contained in:
Luck
2017-10-24 13:05:06 +01:00
Unverified
parent 54695b8046
commit e8896fbdf7
5 changed files with 18 additions and 7 deletions
@@ -454,7 +454,8 @@ public class LPSpongePlugin implements LuckPermsPlugin {
@Override
public String getName() {
return Constants.CONSOLE_NAME.apply(getConfiguration().get(ConfigKeys.SERVER));
LuckPermsConfiguration config = getPlatform().getConfiguration();
return config == null ? Constants.CONSOLE_NAME.apply(null) : Constants.CONSOLE_NAME.apply(config.get(ConfigKeys.SERVER));
}
@Override
@@ -27,7 +27,6 @@ package me.lucko.luckperms.sponge;
import me.lucko.luckperms.api.Tristate;
import me.lucko.luckperms.common.commands.sender.SenderFactory;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.constants.Constants;
import me.lucko.luckperms.common.plugin.LuckPermsPlugin;
import me.lucko.luckperms.common.utils.TextUtils;
@@ -52,7 +51,7 @@ public class SpongeSenderFactory extends SenderFactory<CommandSource> {
if (source instanceof Player) {
return source.getName();
}
return Constants.CONSOLE_NAME.apply(getPlugin().getConfiguration().get(ConfigKeys.SERVER));
return getConsoleName();
}
@Override