Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
Showing only changes of commit 30046e0410 - Show all commits

View File

@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -2858,9 +2859,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (!this.scaledHealth && !force) { if (!this.scaledHealth && !force) {
return; return;
} }
for (AttributeInstance genericInstance : collection) { Iterator<AttributeInstance> iterator = collection.iterator();
while (iterator.hasNext()) {
AttributeInstance genericInstance = iterator.next();
if (genericInstance.getAttribute() == Attributes.MAX_HEALTH) { if (genericInstance.getAttribute() == Attributes.MAX_HEALTH) {
collection.remove(genericInstance); iterator.remove();
break; break;
} }
} }