Mirrors/mcMMO
1
0
Fork 1
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2026-02-20 02:33:15 +01:00
Code Packages Releases Activity

Revert "Dropped SpoutPlugin support"

Browse Source 
This reverts commit 7bac0e2ca5.

Conflicts:
	Changelog.txt
	src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
	src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
	src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
	src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
	src/main/java/com/gmail/nossr50/mcMMO.java
	src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
	src/main/java/com/gmail/nossr50/util/ItemUtils.java
	src/main/java/com/gmail/nossr50/util/Misc.java
	src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
	src/main/resources/plugin.yml
This commit is contained in:
TfT_02
2013-12-31 02:01:50 +01:00
parent 04a02cfdc8
commit 5029f80d29
312 changed files with 1890 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@@ -10,7 +10,9 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.Dye;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.api.SpoutToolsAPI;
import com.gmail.nossr50.config.party.ItemWeightConfig;
import com.gmail.nossr50.datatypes.skills.ToolType;
import com.gmail.nossr50.locale.LocaleLoader;
public final class ItemUtils {
@@ -52,7 +54,7 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomSword(type);
return mcMMO.getModManager().isCustomSword(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.SWORD);
}
}
@@ -74,7 +76,7 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomHoe(type);
return mcMMO.getModManager().isCustomHoe(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.HOE);
}
}
@@ -96,7 +98,7 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomShovel(type);
return mcMMO.getModManager().isCustomShovel(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.SHOVEL);
}
}
@@ -118,7 +120,7 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomAxe(type);
return mcMMO.getModManager().isCustomAxe(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.AXE);
}
}
@@ -140,7 +142,7 @@ public final class ItemUtils {
return true;
default:
return mcMMO.getModManager().isCustomPickaxe(type);
return mcMMO.getModManager().isCustomPickaxe(type) || SpoutToolsAPI.isSpoutTool(item, ToolType.PICKAXE);
}
}