Update web related functionality to point to new locations and APIs (#770) (#784)

This commit is contained in:
Luck
2018-02-22 22:09:37 +00:00
committed by GitHub
Unverified
parent da9977a30f
commit 31d435dc2b
35 changed files with 749 additions and 784 deletions
@@ -105,8 +105,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.stream.Stream;
import javax.annotation.Nullable;
/**
* LuckPerms implementation for the Bukkit API.
*/
@@ -190,7 +188,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
private void enable() {
this.startTime = System.currentTimeMillis();
sendStartupBanner(getConsoleSender());
this.verboseHandler = new VerboseHandler(this.scheduler.asyncBukkit(), getVersion());
this.verboseHandler = new VerboseHandler(this.scheduler.asyncBukkit());
this.permissionVault = new PermissionVault(this.scheduler.asyncBukkit());
this.logDispatcher = new LogDispatcher(this);
@@ -539,14 +537,13 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
}
}
@Nullable
@Override
public Contexts getContextForUser(User user) {
public Optional<Contexts> getContextForUser(User user) {
Player player = getPlayer(user);
if (player == null) {
return null;
return Optional.empty();
}
return this.contextManager.getApplicableContexts(player);
return Optional.of(this.contextManager.getApplicableContexts(player));
}
@Override