Skip to content

Commit 651e14a

Browse files
committed
Make plugin check before register to avoid possible exceptions
1 parent 0ac62d6 commit 651e14a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,15 @@ public Optional<PlaceholderExpansion> register(
180180
Objects.requireNonNull(expansion.getIdentifier(), "The expansion identifier is null!");
181181
Objects.requireNonNull(expansion.getVersion(), "The expansion version is null!");
182182

183-
if (!expansion.register()) {
184-
if (expansion.getRequiredPlugin() != null && !expansion.getRequiredPlugin().isEmpty()) {
185-
if (!Bukkit.getPluginManager().isPluginEnabled(expansion.getRequiredPlugin())) {
186-
Msg.warn("Cannot load expansion %s due to a missing plugin: %s",
187-
expansion.getIdentifier(), expansion.getRequiredPlugin());
188-
return Optional.empty();
189-
}
183+
if (expansion.getRequiredPlugin() != null && !expansion.getRequiredPlugin().isEmpty()) {
184+
if (!Bukkit.getPluginManager().isPluginEnabled(expansion.getRequiredPlugin())) {
185+
Msg.warn("Cannot load expansion %s due to a missing Plugin: %s", expansion.getIdentifier(),
186+
expansion.getRequiredPlugin());
187+
return Optional.empty();
190188
}
191-
189+
}
190+
191+
if (!expansion.register()) {
192192
Msg.warn("Cannot load expansion %s due to an unknown issue.", expansion.getIdentifier());
193193
return Optional.empty();
194194
}

0 commit comments

Comments
 (0)