Re-arrange new methods to fix checkstyle, and better null handling.

elBukkit · Jul 13, 2018 · 514c6fe · 514c6fe
1 parent c511fda
commit 514c6fe
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/magic/MagicController.java b/Magic/src/main/java/com/elmakers/mine/bukkit/magic/MagicController.java
@@ -3777,11 +3777,6 @@ public Wand getWand(ItemStack itemStack) {
         return wand;
     }
 
-    @Override
-    public Wand createWand(ItemStack itemStack) {
-        return Wand.createWand(this, itemStack);
-    }
-
     @Override
     public Wand getWand(ConfigurationSection config) {
         return new Wand(this, config);
@@ -3793,6 +3788,12 @@ public Wand createWand(String wandKey) {
         return Wand.createWand(this, wandKey);
     }
 
+    @Override
+    @Nonnull
+    public Wand createWand(@Nonnull ItemStack itemStack) {
+        return Wand.createWand(this, itemStack);
+    }
+
     @Nullable
     @Override
     public WandTemplate getWandTemplate(String key) {

diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/wand/Wand.java b/Magic/src/main/java/com/elmakers/mine/bukkit/wand/Wand.java
@@ -3264,17 +3264,18 @@ public static Wand createWand(MagicController controller, String templateName) {
         return wand;
     }
 
-    @Nullable
-    public static Wand createWand(MagicController controller, ItemStack itemStack) {
-        if (controller == null) return null;
-
+    @Nonnull
+    public static Wand createWand(@Nonnull MagicController controller, @Nonnull ItemStack itemStack) {
+        Preconditions.checkNotNull(controller);
+        Preconditions.checkNotNull(itemStack);
         Wand wand = null;
         try {
             wand = controller.getWand(InventoryUtils.makeReal(itemStack.clone()));
             wand.saveState();
             wand.updateName();
         } catch (Exception ex) {
             ex.printStackTrace();
+            wand = new Wand(controller);
         }
         return wand;
     }

diff --git a/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/magic/MageController.java b/MagicAPI/src/main/java/com/elmakers/mine/bukkit/api/magic/MageController.java
@@ -76,6 +76,15 @@ public interface MageController {
      */
     Collection<LostWand> getLostWands();
 
+    /**
+     * Creates a copy of the given item and turns it into a Wand.
+     *
+     * @param item The item to get a wand of.
+     * @return The wand of this item.
+     */
+    @Nonnull
+    Wand createWand(@Nonnull ItemStack item);
+
     /**
      * Create a new Wand from a template.
      *
@@ -111,14 +120,6 @@ public interface MageController {
      * @throws IllegalArgumentException If the item is not a wand.
      */
     Wand getWand(ItemStack item);
-
-    /**
-     * Creates a copy of the given item and turns it into a Wand.
-     *
-     * @param item The item to get a wand of.
-     * @return The wand of this item.
-     */
-    Wand createWand(ItemStack item);
     Wand getWand(ConfigurationSection config);
     @Nullable
     WandTemplate getWandTemplate(String key);