mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
d5c9306a7f
* init 1.21.4, and boom! * build change, but weight not work * just work * Build changes, and delete timings * Fix API patches (#406) * Fix API patches * merge --------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> * 0006/0129 * 0009/0129 * 0011/0129 * 0018/0129 * 0030/0129 * 0035/0129 * 0043/0129 * 0048/0129 * 0049/0129 * 0057/0129 * 0065/0129 * 0086/0129 (#408) * 0072/0129 * 0080/0129 * Readd patch infos * 0086/0129 * Delete applied patches * 0087/0129 * 0091/0129 * 0097/0129 * 0101/0129 * 102/129 * 0107/0129 * 0112/0129 * 0118/0129 * 0129/0129, 100% patched * fix some * server work * Protocol... (#409) * Jade v7 * Fix changed part for Jade * Formatting imports, add Lms Paster protocol * REI payloads 5/8 * Add REI support, remove unnecessary content in Jade * Rename * Make jade better * Make action work * fix action jar * Fix some protocol * Fix bot action, and entity tickCount * Fix Warden GameEventListener register on load * Fix extra Raider drop * Fix grindstone overstacking * Update Paper, and some doc * Merge * [ci skip] Update Action --------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
135 lines
5.6 KiB
Diff
135 lines
5.6 KiB
Diff
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 0e214d502998e9eb959952b257844529992df0df..9506c4cf1c757219f9f01c06cf61ad3e40ee0979 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
|
|
@@ -649,17 +649,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.performance.remove.inventoryContainsIterators) {
|
|
+ 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;
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
@@ -668,17 +682,30 @@ public class Inventory implements Container, Nameable {
|
|
}
|
|
|
|
public boolean contains(TagKey<Item> tag) {
|
|
- Iterator iterator = this.compartments.iterator();
|
|
+ if (org.leavesmc.leaves.LeavesConfig.performance.remove.inventoryContainsIterators) {
|
|
+ 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;
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
@@ -687,21 +714,34 @@ public class Inventory implements Container, Nameable {
|
|
}
|
|
|
|
public boolean contains(Predicate<ItemStack> predicate) {
|
|
- Iterator iterator = this.compartments.iterator();
|
|
+ if (org.leavesmc.leaves.LeavesConfig.performance.remove.inventoryContainsIterators) {
|
|
+ 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;
|
|
}
|
|
|