From 07fb53e01572b643704a203cd49eaa678a4c5d15 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 18 Dec 2015 20:58:40 +0000 Subject: [PATCH] Avoid infinite loop. --- .../handlers/itemhandlers/ExtractableItems.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 433e906fb8..799556cb4d 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -50,8 +50,8 @@ public class ExtractableItems implements IItemHandler final L2PcInstance activeChar = playable.getActingPlayer(); final L2EtcItem etcitem = (L2EtcItem) item.getItem(); - final List exitem = etcitem.getExtractableItems(); - if (exitem == null) + final List exitems = etcitem.getExtractableItems(); + if (exitems == null) { _log.info("No extractable data defined for " + etcitem); return false; @@ -69,7 +69,7 @@ public class ExtractableItems implements IItemHandler { while (extractedItems.size() < etcitem.getExtractableCountMin()) { - for (L2ExtractableProduct expi : exitem) + for (L2ExtractableProduct expi : exitems) { if ((etcitem.getExtractableCountMax() > 0) && (extractedItems.size() == etcitem.getExtractableCountMax())) { @@ -97,7 +97,7 @@ public class ExtractableItems implements IItemHandler break; } } - if (alreadyExtracted) + if (alreadyExtracted && (exitems.size() <= etcitem.getExtractableCountMax())) { continue; } @@ -134,7 +134,7 @@ public class ExtractableItems implements IItemHandler } else { - for (L2ExtractableProduct expi : exitem) + for (L2ExtractableProduct expi : exitems) { if ((etcitem.getExtractableCountMax() > 0) && (extractedItems.size() == etcitem.getExtractableCountMax())) {