From e5c4b710f66ca1c6959183d0ee65fe2a12fddb34 Mon Sep 17 00:00:00 2001 From: Luck Date: Sat, 22 Dec 2018 17:04:32 +0000 Subject: [PATCH] Fix CME in Bukkit refreshAutoOp cc @Exloki --- .../lucko/luckperms/bukkit/LPBukkitPlugin.java | 17 +++++++++++++---- .../listeners/BukkitConnectionListener.java | 2 +- .../listeners/BukkitPlatformListener.java | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java index 4ef12979b..2f4778043 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -266,7 +266,7 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin { getApiProvider().getEventBus().subscribe(UserDataRecalculateEvent.class, event -> { User user = ApiUser.cast(event.getUser()); Optional player = getBootstrap().getPlayer(user.getUuid()); - player.ifPresent(this::refreshAutoOp); + player.ifPresent(p -> refreshAutoOp(p, false)); }); } @@ -324,16 +324,25 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin { } } - public void refreshAutoOp(Player player) { + public void refreshAutoOp(Player player, boolean callerIsSync) { if (getConfiguration().get(ConfigKeys.AUTO_OP)) { User user = getUserManager().getIfLoaded(player.getUniqueId()); if (user == null) { - player.setOp(false); + if (callerIsSync) { + player.setOp(false); + } else { + this.bootstrap.getScheduler().executeSync(() -> player.setOp(false)); + } return; } Map permData = user.getCachedData().getPermissionData(this.contextManager.getApplicableContexts(player)).getImmutableBacking(); - player.setOp(permData.getOrDefault("luckperms.autoop", false)); + boolean value = permData.getOrDefault("luckperms.autoop", false); + if (callerIsSync) { + player.setOp(value); + } else { + this.bootstrap.getScheduler().executeSync(() -> player.setOp(value)); + } } } diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java index dd1eb3aa1..b4e2c544e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitConnectionListener.java @@ -164,7 +164,7 @@ public class BukkitConnectionListener extends AbstractConnectionListener impleme return; } - this.plugin.refreshAutoOp(player); + this.plugin.refreshAutoOp(player, true); } @EventHandler(priority = EventPriority.MONITOR) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java index 32fd0521d..28764a628 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/listeners/BukkitPlatformListener.java @@ -95,7 +95,7 @@ public class BukkitPlatformListener implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void onWorldChange(PlayerChangedWorldEvent e) { this.plugin.getContextManager().invalidateCache(e.getPlayer()); - this.plugin.refreshAutoOp(e.getPlayer()); + this.plugin.refreshAutoOp(e.getPlayer(), true); } }