Allow TraitInfo to have an arguments constructor if a supplier is given

CitizensDev · Nov 6, 2022 · b84d7d2 · b84d7d2
1 parent ecff976
commit b84d7d2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/trait/TraitInfo.java b/src/main/java/net/citizensnpcs/api/trait/TraitInfo.java
@@ -22,6 +22,16 @@ public TraitInfo asDefaultTrait() {
         return this;
     }
 
+    public void checkValid() {
+        if (supplier == null) {
+            try {
+                trait.getConstructor(new Class<?>[] {});
+            } catch (NoSuchMethodException e) {
+                throw new IllegalArgumentException("Trait class must have a no-arguments constructor");
+            }
+        }
+    }
+
     public Class<? extends Trait> getTraitClass() {
         return trait;
     }
@@ -75,11 +85,6 @@ public TraitInfo withSupplier(Supplier<? extends Trait> supplier) {
      */
     public static TraitInfo create(Class<? extends Trait> trait) {
         Preconditions.checkNotNull(trait);
-        try {
-            trait.getConstructor(new Class<?>[] {});
-        } catch (NoSuchMethodException e) {
-            throw new IllegalArgumentException("Trait class must have a no-arguments constructor");
-        }
         return new TraitInfo(trait);
     }
 }