mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Re-Added isItemSimiliar for ALWAYS

Browse Source
This commit is contained in:
MisterErwin 2018-09-05 00:13:28 +02:00 committed by TheBusyBiscuit
parent 60b08ac917
commit 55c3d6f711
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java
View File

@ -86,16 +86,16 @@ public class SlimefunManager {
if (item.getType() == SFitem.getType() && item.getAmount() >= SFitem.getAmount()) { if (item.getType() == SFitem.getType() && item.getAmount() >= SFitem.getAmount()) {
//ToDo: Removed data_safe - is that correct? //ToDo: Removed data_safe - is that correct?
// if (data.equals(DataType.ALWAYS) || (data.equals(DataType.IF_COLORED) && data_safe.contains(item.getType()))) { if (data.equals(DataType.ALWAYS)/* || (data.equals(DataType.IF_COLORED) && data_safe.contains(item.getType()))*/) {
// if (data_safe.contains(item.getType())) { /* if (data_safe.contains(item.getType())) {
// if (item.getData().getData() != SFitem.getData().getData()) { if (item.getData().getData() != SFitem.getData().getData()) {
// if (!(SFitem.getDurability() == item.getData().getData() && SFitem.getData().getData() == item.getDurability())) return false; if (!(SFitem.getDurability() == item.getData().getData() && SFitem.getData().getData() == item.getDurability())) return false;
// } }
// } }
// else if (data.equals(DataType.ALWAYS) && item.getDurability() != SFitem.getDurability()) { else*/ if (data.equals(DataType.ALWAYS) && item.getDurability() != SFitem.getDurability()) {
// return false; return false;
// } }
// } }
if (item.hasItemMeta() && SFitem.hasItemMeta()) { if (item.hasItemMeta() && SFitem.hasItemMeta()) {
if (item.getItemMeta().hasDisplayName() && SFitem.getItemMeta().hasDisplayName()) { if (item.getItemMeta().hasDisplayName() && SFitem.getItemMeta().hasDisplayName()) {