diff --git a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java index 7a2cd58..0f88292 100644 --- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java +++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java @@ -340,18 +340,20 @@ public final class LocalExpansionManager implements Listener { } private void unregisterAll() { + Collection expansionsCopy; expansionsLock.lock(); try { - for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) { - if (expansion.persist()) { - continue; - } - - expansion.unregister(); - } + expansionsCopy = Sets.newHashSet(expansions.values()); } finally { expansionsLock.unlock(); } + for (final PlaceholderExpansion expansion : expansionsCopy) { + if (expansion.persist()) { + continue; + } + + expansion.unregister(); + } } @NotNull