Improve dupe fix with Spellbinding Cloth

gamerforEA · Mar 20, 2018 · 4763c1a · 4763c1a
1 parent 59394a9
commit 4763c1a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/thaumic/tinkerer/common/item/SpellClothRecipe.java b/src/main/java/thaumic/tinkerer/common/item/SpellClothRecipe.java
@@ -43,12 +43,19 @@ public boolean matches(InventoryCrafting var1, World var2)
 			if (stack != null)
 			{
 				Item item = stack.getItem();
-				if (stack.isItemEnchanted() && !(item instanceof INoRemoveEnchant) && !foundEnchanted)
+				boolean itemEnchanted = stack.isItemEnchanted();
+
+				// TODO gamerforEA code start
+				if (item instanceof ItemSpellCloth && (foundCloth || itemEnchanted))
+					return false;
+				// TODO gamerforEA code end
+
+				if (itemEnchanted && !(item instanceof INoRemoveEnchant) && !foundEnchanted)
 				{
 					// TODO gamerforEA code start
 					if (EventConfig.disableClothRecipeStack && stack.stackSize != 1)
 						return false;
-					if (!(item instanceof ItemSpellCloth) && item.hasContainerItem(stack))
+					if (item.hasContainerItem(stack))
 						return false;
 					// TODO gamerforEA code end