All pastes #161920 Raw Edit

Untitled

public text v1 · immutable
·published 2006-09-05 22:47 UTC
rendered paste body
Index: java/net/sf/l2j/gameserver/clientpackets/MultiSellChoose.java
===================================================================
--- java/net/sf/l2j/gameserver/clientpackets/MultiSellChoose.java	(revision 2305)
+++ java/net/sf/l2j/gameserver/clientpackets/MultiSellChoose.java	(working copy)
@@ -1,8 +1,9 @@
 package net.sf.l2j.gameserver.clientpackets;
 
 import java.nio.ByteBuffer;
+import java.util.List;
 //import java.util.logging.Logger;
-
+import javolution.util.FastList;
 import net.sf.l2j.gameserver.ClientThread;
 import net.sf.l2j.gameserver.ItemTable;
 import net.sf.l2j.gameserver.model.L2ItemInstance;
@@ -56,8 +57,30 @@
     	PcInventory inv = player.getInventory();
         
         L2ItemInstance oldItem = null;
-    	
-    	for(MultiSellIngredient e : entry.getIngredients())
+        
+        List<MultiSellIngredient> _altIngredientList;
+        _altIngredientList = new FastList<MultiSellIngredient>();
+        for(MultiSellIngredient e: entry.getIngredients())
+        {
+            for(MultiSellIngredient e1: _altIngredientList)
+            {
+                boolean added = false;
+                if(e1.getItemId()==e.getItemId())
+                {
+                    if(e1.getItemEnchant()==e.getItemEnchant())
+                    {
+                        e1.setItemCount(e1.getItemCount()+e.getItemCount());
+                        added = true;
+                        break;
+                    }
+
+                }
+                if(!added)
+                    _altIngredientList.add(e);
+                
+            }
+        }
+    	for(MultiSellIngredient e : _altIngredientList)
     	{
     		L2ItemInstance item = inv.getItemByItemId(e.getItemId(), oldItem);