lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed non weapon and armor items being able to upgrade.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-10-11 21:41:19 +00:00
parent 03b59ce3dc
commit c0dfd05e16
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java
View File

@@ -21,8 +21,6 @@ import java.util.LinkedList;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.Armor;
import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
public class PreparedListContainer extends ListContainer public class PreparedListContainer extends ListContainer
@@ -63,23 +61,18 @@ public class PreparedListContainer extends ListContainer
} }
_entries = new LinkedList<>(); _entries = new LinkedList<>();
for (ItemInstance item : items)
for (Entry entry : template.getEntries())
{ {
// only do the match up on equippable items that are not currently equipped if (!entry.getIngredients().isEmpty())
// so for each appropriate item, produce a set of entries for the multisell list.
if (!item.isEquipped() && ((item.getItem() instanceof Armor) || (item.getItem() instanceof Weapon)))
{ {
// loop through the entries to see which ones we wish to include int ingredientId = entry.getIngredients().get(0).getItemId();
for (Entry ent : template.getEntries()) for (ItemInstance item : items)
{ {
// check ingredients of this entry to see if it's an entry we'd like to include. if (!item.isEquipped() && (item.getId() == ingredientId))
for (Ingredient ing : ent.getIngredients())
{ {
if (item.getId() == ing.getItemId()) _entries.add(new PreparedEntry(entry, item, getApplyTaxes(), getMaintainEnchantment(), taxRate));
{ break;
_entries.add(new PreparedEntry(ent, item, getApplyTaxes(), getMaintainEnchantment(), taxRate));
break; // next entry
}
} }
} }
} }