From 8795383e7cd49eba61477dc714ccab30653f7b69 Mon Sep 17 00:00:00 2001 From: Luck Date: Wed, 21 Dec 2016 21:34:43 +0000 Subject: [PATCH] Make sync command reload sponge data too - resolves #98 --- .../me/lucko/luckperms/common/LuckPermsPlugin.java | 7 +++++++ .../me/lucko/luckperms/common/tasks/UpdateTask.java | 2 ++ .../me/lucko/luckperms/sponge/LPSpongePlugin.java | 12 ++++++++++++ 3 files changed, 21 insertions(+) diff --git a/common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java b/common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java index 3235bd442..2332983f1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java +++ b/common/src/main/java/me/lucko/luckperms/common/LuckPermsPlugin.java @@ -366,4 +366,11 @@ public interface LuckPermsPlugin { */ BufferedRequest getUpdateTaskBuffer(); + /** + * Called at the end of the sync task. + */ + default void onPostUpdate() { + + } + } diff --git a/common/src/main/java/me/lucko/luckperms/common/tasks/UpdateTask.java b/common/src/main/java/me/lucko/luckperms/common/tasks/UpdateTask.java index de4827638..d06b9ae4c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/tasks/UpdateTask.java +++ b/common/src/main/java/me/lucko/luckperms/common/tasks/UpdateTask.java @@ -54,6 +54,8 @@ public class UpdateTask implements Runnable { // Refresh all online users. plugin.getUserManager().updateAllUsers(); + plugin.onPostUpdate(); + plugin.getApiProvider().fireEvent(new PostSyncEvent()); } } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java index f3be15e82..6d1f5369d 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/LPSpongePlugin.java @@ -62,6 +62,8 @@ import me.lucko.luckperms.sponge.managers.SpongeGroupManager; import me.lucko.luckperms.sponge.managers.SpongeUserManager; import me.lucko.luckperms.sponge.service.LuckPermsService; import me.lucko.luckperms.sponge.service.ServiceCacheHousekeepingTask; +import me.lucko.luckperms.sponge.service.base.LPSubjectCollection; +import me.lucko.luckperms.sponge.service.persisted.PersistedCollection; import me.lucko.luckperms.sponge.timings.LPTimings; import me.lucko.luckperms.sponge.utils.VersionData; @@ -305,6 +307,16 @@ public class LPSpongePlugin implements LuckPermsPlugin { } } + @Override + public void onPostUpdate() { + for (LPSubjectCollection collection : service.getCollections().values()) { + if (collection instanceof PersistedCollection) { + ((PersistedCollection) collection).loadAll(); + } + } + service.invalidateParentCaches(); + } + @SuppressWarnings("ResultOfMethodCallIgnored") @Override public File getMainDir() {