Explorar el Código

Fixed Spout item checks.

GJ hace 13 años
padre
commit
6637758ad0

+ 3 - 3
src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java

@@ -3,10 +3,10 @@ package com.gmail.nossr50.api;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
-import org.getspout.spoutapi.inventory.SpoutItemStack;
+import org.bukkit.inventory.ItemStack;
 
 
 public class SpoutToolsAPI {
 public class SpoutToolsAPI {
-    public static List<SpoutItemStack> spoutSwords = new ArrayList<SpoutItemStack>();
+    public static List<ItemStack> spoutSwords = new ArrayList<ItemStack>();
 
 
     /**
     /**
      * Add a custom Spout sword to mcMMO for XP gain & ability use.
      * Add a custom Spout sword to mcMMO for XP gain & ability use.
@@ -15,7 +15,7 @@ public class SpoutToolsAPI {
      *
      *
      * @param spoutSword The sword to add
      * @param spoutSword The sword to add
      */
      */
-    public void addCustomSword(SpoutItemStack spoutSword) {
+    public void addCustomSword(ItemStack spoutSword) {
         spoutSwords.add(spoutSword);
         spoutSwords.add(spoutSword);
     }
     }
 }
 }

+ 1 - 2
src/main/java/com/gmail/nossr50/util/ItemChecks.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.util;
 package com.gmail.nossr50.util;
 
 
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.ItemStack;
-import org.getspout.spoutapi.inventory.SpoutItemStack;
 
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.api.SpoutToolsAPI;
 import com.gmail.nossr50.api.SpoutToolsAPI;
@@ -33,7 +32,7 @@ public class ItemChecks {
             if (customToolsEnabled && CustomToolsConfig.getInstance().customSwordIDs.contains(is.getTypeId())) {
             if (customToolsEnabled && CustomToolsConfig.getInstance().customSwordIDs.contains(is.getTypeId())) {
                 return true;
                 return true;
             }
             }
-            else if (mcMMO.p.spoutEnabled && is instanceof SpoutItemStack && SpoutToolsAPI.spoutSwords.contains((SpoutItemStack) is)) {
+            else if (mcMMO.p.spoutEnabled && SpoutToolsAPI.spoutSwords.contains(is)) {
                 return true;
                 return true;
             }
             }
             else {
             else {