From 12a358fbd01aac2cf355fa0e353800b256e2906d Mon Sep 17 00:00:00 2001
From: extendedclip <fairviewent@yahoo.com>
Date: Mon, 3 Aug 2020 10:24:56 -0400
Subject: [PATCH] Check if canRegister in LocalExpansionManager.register rather
 than in Expansion#register

---
 .../clip/placeholderapi/expansion/PlaceholderExpansion.java   | 2 +-
 .../expansion/manager/LocalExpansionManager.java              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java
index 3a0ba4b..965feea 100644
--- a/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java
+++ b/src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java
@@ -137,7 +137,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
    * @return true if this expansion is now registered with PlaceholderAPI
    */
   public boolean register() {
-    return canRegister() && getPlaceholderAPI().getLocalExpansionManager().register(this);
+    return getPlaceholderAPI().getLocalExpansionManager().register(this);
   }
 
   /**
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 c6c4eae..febb5d0 100644
--- a/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
+++ b/src/main/java/me/clip/placeholderapi/expansion/manager/LocalExpansionManager.java
@@ -159,6 +159,10 @@ public final class LocalExpansionManager implements Listener {
   public boolean register(@NotNull final PlaceholderExpansion expansion) {
     final String identifier = expansion.getIdentifier().toLowerCase();
 
+    if (!expansion.canRegister()) {
+      return false;
+    }
+
     if (expansion instanceof Configurable) {
       Map<String, Object> defaults = ((Configurable) expansion).getDefaults();
       String pre = "expansions." + identifier + ".";