Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-02-26 09:21:49 +01:00
Code Issues Projects Releases Wiki Activity

small cleanup

Browse Source
This commit is contained in:
Luck 2016-07-12 11:50:49 +01:00
parent f35cb95001
commit ad9b190a7c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/me/lucko/luckperms/CommandManagerBukkit.java
View File

@ -20,7 +20,7 @@ class CommandManagerBukkit extends CommandManager implements CommandExecutor {
return onCommand(new Sender() { return onCommand(new Sender() {
@Override @Override
public void sendMessage(String s) { public void sendMessage(String s) {
CommandSender c = cs.get(); final CommandSender c = cs.get();
if (c != null) { if (c != null) {
c.sendMessage(s); c.sendMessage(s);
} }
@ -28,7 +28,7 @@ class CommandManagerBukkit extends CommandManager implements CommandExecutor {
@Override @Override
public boolean hasPermission(String node) { public boolean hasPermission(String node) {
CommandSender c = cs.get(); final CommandSender c = cs.get();
return c != null && c.hasPermission(node); return c != null && c.hasPermission(node);
} }
}, Arrays.asList(args)); }, Arrays.asList(args));

2
bukkit/src/main/resources/config.yml
View File

@ -3,7 +3,7 @@
# The name of the server, used for server specific permissions. Set to 'global' to disable. # The name of the server, used for server specific permissions. Set to 'global' to disable.
server: global server: global
# The default group assigned to all user on join. # The default group assigned to all users on their first join.
default-group: default default-group: default
# If users on this server should have their global permissions/groups applied. # If users on this server should have their global permissions/groups applied.

11
bungee/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
View File

@ -22,20 +22,23 @@ public class PlayerListener implements Listener {
@EventHandler @EventHandler
public void onPlayerPostLogin(PostLoginEvent e) { public void onPlayerPostLogin(PostLoginEvent e) {
final ProxiedPlayer player = e.getPlayer(); final ProxiedPlayer player = e.getPlayer();
final WeakReference<ProxiedPlayer> p = new WeakReference<>(player);
plugin.getDatastore().loadOrCreateUser(player.getUniqueId(), player.getName(), success -> { plugin.getDatastore().loadOrCreateUser(player.getUniqueId(), player.getName(), success -> {
if (!success) { if (!success) {
WeakReference<ProxiedPlayer> p = new WeakReference<>(player);
plugin.getProxy().getScheduler().schedule(plugin, () -> { plugin.getProxy().getScheduler().schedule(plugin, () -> {
ProxiedPlayer pl = p.get(); final ProxiedPlayer pl = p.get();
if (pl != null) { if (pl != null) {
pl.sendMessage(new TextComponent(Util.color(Util.PREFIX + "Permissions data could not be loaded. Please contact an administrator."))); pl.sendMessage(new TextComponent(Util.color(Util.PREFIX + "Permissions data could not be loaded. Please contact an administrator.")));
} }
}, 3, TimeUnit.SECONDS); }, 3, TimeUnit.SECONDS);
} else { } else {
User user = plugin.getUserManager().getUser(player.getUniqueId()); final ProxiedPlayer pl = p.get();
user.refreshPermissions(); if (pl != null) {
final User user = plugin.getUserManager().getUser(pl.getUniqueId());
user.refreshPermissions();
}
} }
}); });

2
bungee/src/main/resources/config.yml
View File

@ -3,7 +3,7 @@
# The name of the server, used for server specific permissions. Set to 'global' to disable. # The name of the server, used for server specific permissions. Set to 'global' to disable.
server: bungee server: bungee
# The default group assigned to all user on join. # The default group assigned to all users on their first join.
default-group: default default-group: default
# If users on this server should have their global permissions/groups applied. # If users on this server should have their global permissions/groups applied.