Auto peel packet fix and small addition.
Contributed by Index.
This commit is contained in:
@@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExResultItemAutoPeel;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExStopItemAutoPeel;
|
||||
|
||||
/**
|
||||
* Extractable Items handler.
|
||||
@@ -240,15 +241,22 @@ public class ExtractableItems implements IItemHandler
|
||||
}
|
||||
|
||||
final AutoPeelRequest request = player.getRequest(AutoPeelRequest.class);
|
||||
if ((request != null) && request.isProcessing())
|
||||
if (request != null)
|
||||
{
|
||||
request.setProcessing(false);
|
||||
final List<ItemHolder> rewards = new LinkedList<>();
|
||||
for (Entry<Item, Long> entry : extractedItems.entrySet())
|
||||
if (request.isProcessing())
|
||||
{
|
||||
rewards.add(new ItemHolder(entry.getKey().getId(), entry.getValue()));
|
||||
request.setProcessing(false);
|
||||
final List<ItemHolder> rewards = new LinkedList<>();
|
||||
for (Entry<Item, Long> entry : extractedItems.entrySet())
|
||||
{
|
||||
rewards.add(new ItemHolder(entry.getKey().getId(), entry.getValue()));
|
||||
}
|
||||
player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards));
|
||||
}
|
||||
else
|
||||
{
|
||||
player.sendPacket(new ExStopItemAutoPeel(false));
|
||||
}
|
||||
player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@@ -35,7 +35,7 @@ public class ExStopItemAutoPeel implements IClientOutgoingPacket
|
||||
@Override
|
||||
public boolean write(PacketWriter packet)
|
||||
{
|
||||
OutgoingPackets.EX_RESULT_ITEM_AUTO_PEEL.writeId(packet);
|
||||
OutgoingPackets.EX_STOP_ITEM_AUTO_PEEL.writeId(packet);
|
||||
packet.writeC(_result ? 1 : 0);
|
||||
return true;
|
||||
}
|
||||
|
@@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExResultItemAutoPeel;
|
||||
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExStopItemAutoPeel;
|
||||
|
||||
/**
|
||||
* Extractable Items handler.
|
||||
@@ -240,15 +241,22 @@ public class ExtractableItems implements IItemHandler
|
||||
}
|
||||
|
||||
final AutoPeelRequest request = player.getRequest(AutoPeelRequest.class);
|
||||
if ((request != null) && request.isProcessing())
|
||||
if (request != null)
|
||||
{
|
||||
request.setProcessing(false);
|
||||
final List<ItemHolder> rewards = new LinkedList<>();
|
||||
for (Entry<Item, Long> entry : extractedItems.entrySet())
|
||||
if (request.isProcessing())
|
||||
{
|
||||
rewards.add(new ItemHolder(entry.getKey().getId(), entry.getValue()));
|
||||
request.setProcessing(false);
|
||||
final List<ItemHolder> rewards = new LinkedList<>();
|
||||
for (Entry<Item, Long> entry : extractedItems.entrySet())
|
||||
{
|
||||
rewards.add(new ItemHolder(entry.getKey().getId(), entry.getValue()));
|
||||
}
|
||||
player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards));
|
||||
}
|
||||
else
|
||||
{
|
||||
player.sendPacket(new ExStopItemAutoPeel(false));
|
||||
}
|
||||
player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@@ -35,7 +35,7 @@ public class ExStopItemAutoPeel implements IClientOutgoingPacket
|
||||
@Override
|
||||
public boolean write(PacketWriter packet)
|
||||
{
|
||||
OutgoingPackets.EX_RESULT_ITEM_AUTO_PEEL.writeId(packet);
|
||||
OutgoingPackets.EX_STOP_ITEM_AUTO_PEEL.writeId(packet);
|
||||
packet.writeC(_result ? 1 : 0);
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user