Huge cleanup

This commit is contained in:
Luck
2016-06-29 15:35:57 +01:00
Unverified
parent 0e449cdd7a
commit 84335afacd
43 changed files with 351 additions and 378 deletions
@@ -6,6 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import java.lang.ref.WeakReference;
import java.util.Arrays;
class CommandManagerBukkit extends CommandManager implements CommandExecutor {
@@ -15,15 +16,20 @@ class CommandManagerBukkit extends CommandManager implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
final WeakReference<CommandSender> cs = new WeakReference<>(sender);
return onCommand(new Sender() {
@Override
public void sendMessage(String s) {
sender.sendMessage(s);
CommandSender c = cs.get();
if (c != null) {
c.sendMessage(s);
}
}
@Override
public boolean hasPermission(String node) {
return sender.hasPermission(node);
CommandSender c = cs.get();
return c != null && c.hasPermission(node);
}
}, Arrays.asList(args));
}
@@ -123,8 +123,7 @@ public class LPBukkitPlugin extends JavaPlugin implements LuckPermsPlugin {
@Override
public String getPlayerStatus(UUID uuid) {
if (getServer().getPlayer(uuid) != null) return "&aOnline";
return "&cOffline";
return getServer().getPlayer(uuid) != null ? "&aOnline" : "&cOffline";
}
@Override
@@ -40,15 +40,11 @@ public class BukkitUser extends User {
}
// Clear existing permissions
for (String p : attachment.getPermissions().keySet()) {
attachment.setPermission(p, false);
}
attachment.getPermissions().keySet().stream().forEach(p -> attachment.setPermission(p, false));
// Re-add all defined permissions for the user
Map<String, Boolean> local = getLocalPermissions(getPlugin().getConfiguration().getServer(), null);
for (String node : local.keySet()) {
attachment.setPermission(node, local.get(node));
}
local.entrySet().stream().forEach(e -> attachment.setPermission(e.getKey(), e.getValue()));
});
}
}
@@ -54,8 +54,6 @@ public class BukkitUserManager extends UserManager {
@Override
public void updateAllUsers() {
for (Player p : plugin.getServer().getOnlinePlayers()) {
plugin.getDatastore().loadUser(p.getUniqueId());
}
plugin.getServer().getOnlinePlayers().stream().map(Player::getUniqueId).forEach(u -> plugin.getDatastore().loadUser(u));
}
}