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

Fixed extractable item messages.

Browse Source
This commit is contained in:
MobiusDev
2016-07-30 12:38:11 +00:00
parent 10fad36e7c
commit 7bb9d230b2
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -17,7 +17,9 @@
package handlers.itemhandlers; package handlers.itemhandlers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
@@ -61,7 +63,7 @@ public class ExtractableItems implements IItemHandler
return false; return false;
} }
final List<L2ItemInstance> extractedItems = new ArrayList<>(); final Map<L2ItemInstance, Long> extractedItems = new HashMap<>();
final List<L2ItemInstance> enchantedItems = new ArrayList<>(); final List<L2ItemInstance> enchantedItems = new ArrayList<>();
if (etcitem.getExtractableCountMin() > 0) if (etcitem.getExtractableCountMin() > 0)
{ {
@@ -87,7 +89,7 @@ public class ExtractableItems implements IItemHandler
// Do not extract the same item. // Do not extract the same item.
boolean alreadyExtracted = false; boolean alreadyExtracted = false;
for (L2ItemInstance i : extractedItems) for (L2ItemInstance i : extractedItems.keySet())
{ {
if (i.getItem().getId() == expi.getId()) if (i.getItem().getId() == expi.getId())
{ {
@@ -108,8 +110,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
extractedItems.add(newItem); addItem(extractedItems, newItem);
sendMessage(activeChar, newItem);
} }
else else
{ {
@@ -121,8 +122,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
extractedItems.add(newItem); addItem(extractedItems, newItem);
sendMessage(activeChar, newItem);
createItemAmount--; createItemAmount--;
} }
} }
@@ -158,8 +158,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
extractedItems.add(newItem); addItem(extractedItems, newItem);
sendMessage(activeChar, newItem);
} }
else else
{ {
@@ -171,8 +170,7 @@ public class ExtractableItems implements IItemHandler
newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant())); newItem.setEnchantLevel(Rnd.get(expi.getMinEnchant(), expi.getMaxEnchant()));
enchantedItems.add(newItem); enchantedItems.add(newItem);
} }
extractedItems.add(newItem); addItem(extractedItems, newItem);
sendMessage(activeChar, newItem);
createItemAmount--; createItemAmount--;
} }
} }
@@ -194,17 +192,34 @@ public class ExtractableItems implements IItemHandler
activeChar.sendPacket(playerIU); activeChar.sendPacket(playerIU);
} }
for (L2ItemInstance i : extractedItems.keySet())
{
sendMessage(activeChar, i, extractedItems.get(i));
}
return true; return true;
} }
private void sendMessage(L2PcInstance player, L2ItemInstance item) private void addItem(Map<L2ItemInstance, Long> extractedItems, L2ItemInstance newItem)
{
if (extractedItems.get(newItem) != null)
{
extractedItems.put(newItem, extractedItems.get(newItem) + 1);
}
else
{
extractedItems.put(newItem, 1L);
}
}
private void sendMessage(L2PcInstance player, L2ItemInstance item, Long count)
{ {
final SystemMessage sm; final SystemMessage sm;
if (item.getCount() > 1) if (count > 1)
{ {
sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1);
sm.addItemName(item); sm.addItemName(item);
sm.addLong(item.getCount()); sm.addLong(count);
} }
else if (item.getEnchantLevel() > 0) else if (item.getEnchantLevel() > 0)
{ {