Fix item removal order for recipe matches

SlimeKnights · Jul 3, 2016 · 01f0539 · 01f0539
1 parent 72e268f
commit 01f0539
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/slimeknights/mantle/util/RecipeMatch.java b/src/main/java/slimeknights/mantle/util/RecipeMatch.java
@@ -111,8 +111,10 @@ public static RecipeMatch ofNBT(ItemStack stack, int matched) {
 
   /** Removes the match from the stacks */
   public static void removeMatch(ItemStack[] stacks, Match match) {
+    // ensure that the order is the same, so that even if multiple of the same type are contained it has the expected result
+    int i = 0;
     for(ItemStack stack : match.stacks) {
-      for(int i = 0; i < stacks.length; i++) {
+      for(; i < stacks.length; i++) {
         // nbt sensitive since toolparts etc. use nbt
         if(ItemStack.areItemsEqual(stack, stacks[i]) && ItemStack.areItemStackTagsEqual(stack, stacks[i])) {
           if(stacks[i].stackSize < stack.stackSize) {
@@ -124,6 +126,7 @@ public static void removeMatch(ItemStack[] stacks, Match match) {
               stacks[i] = null;
             }
           }
+          i++;
           break;
         }
       }