SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2024-11-18 00:46:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move check to before expansions.remove and remove redundant check in unregisterAll

Browse Source
This commit is contained in:
Andre601 2024-07-07 22:05:58 +02:00
parent 9689eec3ab
commit 0ba5e5dd89
No known key found for this signature in database
GPG Key ID: 90E82BD59347A86C
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
View File

@ -324,23 +324,19 @@ public final class LocalExpansionManager implements Listener {
@ApiStatus.Internal @ApiStatus.Internal
public boolean unregister(@NotNull final PlaceholderExpansion expansion) { public boolean unregister(@NotNull final PlaceholderExpansion expansion) {
if (expansions.remove(expansion.getIdentifier().toLowerCase(Locale.ROOT)) == null) {
return false;
}
// Don't unregister expansions that are marked internal or set to be persistent.
if (expansion.getExpansionType() == Type.INTERNAL || expansion.persist()) { if (expansion.getExpansionType() == Type.INTERNAL || expansion.persist()) {
// Print warning if an external expansion is set to be persistent.
if (expansion.getExpansionType() == Type.EXTERNAL && expansion.persist()) { if (expansion.getExpansionType() == Type.EXTERNAL && expansion.persist()) {
Msg.warn("Nag author(s) %s about their expansion %s being marked as \"external\" " Msg.warn("Nag Author(s) %s about their external expansion %s having persist set to true",
+ "but having persist() set to true!", expansion.getAuthor(), expansion.getIdentifier()); expansion.getAuthor(), expansion.getIdentifier());
Msg.warn("External Expansions should not be set to be persistent! PlaceholderAPI "
+ "will respect this setting and skip the unregister of this Expansion...");
} }
return true; return true;
} }
if (expansions.remove(expansion.getIdentifier().toLowerCase(Locale.ROOT)) == null) {
return false;
}
Bukkit.getPluginManager().callEvent(new ExpansionUnregisterEvent(expansion)); Bukkit.getPluginManager().callEvent(new ExpansionUnregisterEvent(expansion));
if (expansion instanceof Listener) { if (expansion instanceof Listener) {
@ -410,18 +406,6 @@ public final class LocalExpansionManager implements Listener {
private void unregisterAll() { private void unregisterAll() {
for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) { for (final PlaceholderExpansion expansion : Sets.newHashSet(expansions.values())) {
if (expansion.persist() || expansion.getExpansionType() == Type.INTERNAL) {
// Print warning if an external expansion is set to be persistent.
if (expansion.getExpansionType() == Type.EXTERNAL && expansion.persist()) {
Msg.warn("Nag author(s) %s about their expansion %s being marked as \"external\" "
+ "but having persist() set to true!", expansion.getAuthor(), expansion.getIdentifier());
Msg.warn("External Expansions should not be set to be persistent! PlaceholderAPI "
+ "will respect this setting and skip the unregister of this Expansion...");
}
continue;
}
expansion.unregister(); expansion.unregister();
} }
} }