Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-21 03:51:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix infinite loop in last ocmmit

Browse Source
This commit is contained in:
fullwall 2024-09-09 19:47:48 +08:00
parent d4fba3b549
commit 826008dac6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
View File

@ -8,7 +8,6 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
@ -506,11 +505,11 @@ public class NMSImpl implements NMSBridge {
@Override
public void clearMerchantComponentPredicates(Merchant merchant, Set<Integer> clearComponentPredicates) {
net.minecraft.world.item.trading.Merchant handle = ((CraftMerchant) merchant).getMerchant();
ListIterator<MerchantOffer> itr = handle.getOffers().listIterator();
Iterator<MerchantOffer> itr = handle.getOffers().iterator();
for (int i = 0; itr.hasNext(); i++) {
MerchantOffer offer = itr.next();
if (!clearComponentPredicates.contains(i))
continue;
MerchantOffer offer = itr.next();
offer.baseCostA = new ItemCost(offer.baseCostA.item(), offer.baseCostA.count(),
DataComponentPredicate.EMPTY, offer.baseCostA.itemStack());
ItemCost costB = offer.getItemCostB().orElseGet(() -> null);

5
v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
View File

@ -8,7 +8,6 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
@ -486,11 +485,11 @@ public class NMSImpl implements NMSBridge {
@Override
public void clearMerchantComponentPredicates(Merchant merchant, Set<Integer> clearComponentPredicates) {
net.minecraft.world.item.trading.Merchant handle = ((CraftMerchant) merchant).getMerchant();
ListIterator<MerchantOffer> itr = handle.getOffers().listIterator();
Iterator<MerchantOffer> itr = handle.getOffers().iterator();
for (int i = 0; itr.hasNext(); i++) {
MerchantOffer offer = itr.next();
if (!clearComponentPredicates.contains(i))
continue;
MerchantOffer offer = itr.next();
offer.baseCostA = new ItemCost(offer.baseCostA.item(), offer.baseCostA.count(),
DataComponentPredicate.EMPTY, offer.baseCostA.itemStack());
ItemCost costB = offer.getItemCostB().orElseGet(() -> null);