From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Wed, 17 Aug 2022 11:04:12 +0800
Subject: [PATCH] Remove iterators from inventory contains

This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)

diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
index 6e66141dca61f777b354854b5d0bac2570b8bf3b..eb11482f48c9f330b7fa62a278fd6f07d3a642e1 100644
--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
@@ -643,17 +643,31 @@ public class Inventory implements Container, Nameable {
     }
 
     public boolean contains(ItemStack stack) {
-        Iterator iterator = this.compartments.iterator();
+        // Leaves start - don't allocate iterators
+        if (org.leavesmc.leaves.LeavesConfig.removeInventoryContainsIterators) {
+            for (int i = 0; i < this.compartments.size(); i++) {
+                List<ItemStack> list = this.compartments.get(i);
+                for (int j = 0; j < list.size(); j++) {
+                    ItemStack itemstack = list.get(j);
+
+                    if (!itemstack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, stack)) {
+                        return true;
+                    }
+                }
+            }
+        } else {
+            Iterator iterator = this.compartments.iterator();
 
-        while (iterator.hasNext()) {
-            List<ItemStack> list = (List) iterator.next();
-            Iterator iterator1 = list.iterator();
+            while (iterator.hasNext()) {
+                List<ItemStack> list = (List) iterator.next();
+                Iterator iterator1 = list.iterator();
 
-            while (iterator1.hasNext()) {
-                ItemStack itemstack1 = (ItemStack) iterator1.next();
+                while (iterator1.hasNext()) {
+                    ItemStack itemstack1 = (ItemStack) iterator1.next();
 
-                if (!itemstack1.isEmpty() && ItemStack.isSameItemSameComponents(itemstack1, stack)) {
-                    return true;
+                    if (!itemstack1.isEmpty() && ItemStack.isSameItemSameComponents(itemstack1, stack)) {
+                        return true;
+                    }
                 }
             }
         }
@@ -662,17 +676,30 @@ public class Inventory implements Container, Nameable {
     }
 
     public boolean contains(TagKey<Item> tag) {
-        Iterator iterator = this.compartments.iterator();
+        if (org.leavesmc.leaves.LeavesConfig.removeInventoryContainsIterators) {
+            for (int i = 0; i < this.compartments.size(); i++) {
+                List<ItemStack> list = this.compartments.get(i);
+                for (int j = 0; j < list.size(); j++) {
+                    ItemStack itemstack = list.get(j);
 
-        while (iterator.hasNext()) {
-            List<ItemStack> list = (List) iterator.next();
-            Iterator iterator1 = list.iterator();
+                    if (!itemstack.isEmpty() && itemstack.is(tag)) {
+                        return true;
+                    }
+                }
+            }
+        } else {
+            Iterator iterator = this.compartments.iterator();
+
+            while (iterator.hasNext()) {
+                List<ItemStack> list = (List) iterator.next();
+                Iterator iterator1 = list.iterator();
 
-            while (iterator1.hasNext()) {
-                ItemStack itemstack = (ItemStack) iterator1.next();
+                while (iterator1.hasNext()) {
+                    ItemStack itemstack = (ItemStack) iterator1.next();
 
-                if (!itemstack.isEmpty() && itemstack.is(tag)) {
-                    return true;
+                    if (!itemstack.isEmpty() && itemstack.is(tag)) {
+                        return true;
+                    }
                 }
             }
         }
@@ -681,21 +708,34 @@ public class Inventory implements Container, Nameable {
     }
 
     public boolean contains(Predicate<ItemStack> predicate) {
-        Iterator iterator = this.compartments.iterator();
+        if (org.leavesmc.leaves.LeavesConfig.removeInventoryContainsIterators) {
+            for (int i = 0; i < this.compartments.size(); i++) {
+                List<ItemStack> list = this.compartments.get(i);
+                for (int j = 0; j < list.size(); j++) {
+                    ItemStack itemstack = list.get(j);
 
-        while (iterator.hasNext()) {
-            List<ItemStack> list = (List) iterator.next();
-            Iterator iterator1 = list.iterator();
+                    if (predicate.test(itemstack)) {
+                        return true;
+                    }
+                }
+            }
+        } else {
+            Iterator iterator = this.compartments.iterator();
 
-            while (iterator1.hasNext()) {
-                ItemStack itemstack = (ItemStack) iterator1.next();
+            while (iterator.hasNext()) {
+                List<ItemStack> list = (List) iterator.next();
+                Iterator iterator1 = list.iterator();
 
-                if (predicate.test(itemstack)) {
-                    return true;
+                while (iterator1.hasNext()) {
+                    ItemStack itemstack = (ItemStack) iterator1.next();
+
+                    if (predicate.test(itemstack)) {
+                        return true;
+                    }
                 }
             }
         }
-
+        // Leaves end - don't allocate iterators
         return false;
     }