Auto peel packet fix and small addition.

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

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,7 +241,9 @@ 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)
{
if (request.isProcessing())
{ {
request.setProcessing(false); request.setProcessing(false);
final List<ItemHolder> rewards = new LinkedList<>(); final List<ItemHolder> rewards = new LinkedList<>();
@@ -250,6 +253,11 @@ public class ExtractableItems implements IItemHandler
} }
player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards)); player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards));
} }
else
{
player.sendPacket(new ExStopItemAutoPeel(false));
}
}
return true; return true;
} }

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;
} }

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,7 +241,9 @@ 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)
{
if (request.isProcessing())
{ {
request.setProcessing(false); request.setProcessing(false);
final List<ItemHolder> rewards = new LinkedList<>(); final List<ItemHolder> rewards = new LinkedList<>();
@@ -250,6 +253,11 @@ public class ExtractableItems implements IItemHandler
} }
player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards)); player.sendPacket(new ExResultItemAutoPeel(true, request.getTotalPeelCount(), request.getRemainingPeelCount() - 1, rewards));
} }
else
{
player.sendPacket(new ExStopItemAutoPeel(false));
}
}
return true; return true;
} }

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;
} }