diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java index 88dcd6248..e4db8450e 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitBootstrap.java @@ -88,6 +88,7 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap private final CountDownLatch loadLatch = new CountDownLatch(1); private final CountDownLatch enableLatch = new CountDownLatch(1); private boolean serverStarting = true; + private boolean serverStopping = false; // if the plugin has been loaded on an incompatible version private boolean incompatibleVersion = false; @@ -150,6 +151,8 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap return; } + this.serverStopping = true; + this.serverStopping = false; this.startTime = Instant.now(); try { this.plugin.enable(); @@ -167,8 +170,8 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap return; } + this.serverStopping = true; this.plugin.disable(); - this.serverStarting = true; } @Override @@ -185,6 +188,10 @@ public class LPBukkitBootstrap extends JavaPlugin implements LuckPermsBootstrap return this.serverStarting; } + public boolean isServerStopping() { + return this.serverStopping; + } + // provide information about the plugin @Override 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 2e4264ed5..e4c303a9a 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/LPBukkitPlugin.java @@ -333,6 +333,10 @@ public class LPBukkitPlugin extends AbstractLuckPermsPlugin { return; } + if (!callerIsSync && this.bootstrap.isServerStopping()) { + return; + } + User user = getUserManager().getIfLoaded(player.getUniqueId()); boolean value;