Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 03:27:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixed Spout item checks.

Browse Source
This commit is contained in:
GJ 2012-06-01 15:29:16 -04:00
parent 41e9bd3cb5
commit 6637758ad0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/api/SpoutToolsAPI.java
View File

@ -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);
} }
} }

3
src/main/java/com/gmail/nossr50/util/ItemChecks.java
View File

@ -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 {