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

Auto peel packet fix and small addition.

Browse Source 
Contributed by Index.
This commit is contained in:
MobiusDevelopment
2022-10-25 21:17:32 +00:00
parent 029754a6bf
commit 64c4efcd7e
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExResultItemAutoPeel; import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExResultItemAutoPeel;
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExStopItemAutoPeel;
/** /**
* Extractable Items handler. * Extractable Items handler.
@@ -240,15 +241,22 @@ public class ExtractableItems implements IItemHandler
} }
final AutoPeelRequest request = player.getRequest(AutoPeelRequest.class); final AutoPeelRequest request = player.getRequest(AutoPeelRequest.class);
if ((request != null) && request.isProcessing()) if (request != null)
{ {
request.setProcessing(false); if (request.isProcessing())
final List<ItemHolder> rewards = new LinkedList<>();
for (Entry<Item, Long> entry : extractedItems.entrySet())
{ {
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; return true;

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/autopeel/ExStopItemAutoPeel.java
View File

@@ -35,7 +35,7 @@ public class ExStopItemAutoPeel implements IClientOutgoingPacket
@Override @Override
public boolean write(PacketWriter packet) 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); packet.writeC(_result ? 1 : 0);
return true; return true;
} }

20
L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -39,6 +39,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExResultItemAutoPeel; import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExResultItemAutoPeel;
import org.l2jmobius.gameserver.network.serverpackets.autopeel.ExStopItemAutoPeel;
/** /**
* Extractable Items handler. * Extractable Items handler.
@@ -240,15 +241,22 @@ public class ExtractableItems implements IItemHandler
} }
final AutoPeelRequest request = player.getRequest(AutoPeelRequest.class); final AutoPeelRequest request = player.getRequest(AutoPeelRequest.class);
if ((request != null) && request.isProcessing()) if (request != null)
{ {
request.setProcessing(false); if (request.isProcessing())
final List<ItemHolder> rewards = new LinkedList<>();
for (Entry<Item, Long> entry : extractedItems.entrySet())
{ {
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; return true;

2
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/autopeel/ExStopItemAutoPeel.java
View File

@@ -35,7 +35,7 @@ public class ExStopItemAutoPeel implements IClientOutgoingPacket
@Override @Override
public boolean write(PacketWriter packet) 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); packet.writeC(_result ? 1 : 0);
return true; return true;
} }