Proper RequestCancelPostAttachment InventoryUpdate logic.

Contributed by aviengier.
This commit is contained in:
MobiusDevelopment 2022-01-27 06:23:43 +00:00
parent 310ea57339
commit 06f6886c6a
23 changed files with 69 additions and 115 deletions

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -180,7 +180,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -202,10 +202,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendPacket(playerIU);
}
else
{
player.sendPacket(new ItemList(player, false));
}
// Send full list to avoid duplicates.
player.sendPacket(new ItemList(player, false));
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);

View File

@ -180,7 +180,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -202,10 +202,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendPacket(playerIU);
}
else
{
player.sendPacket(new ItemList(player, false));
}
// Send full list to avoid duplicates.
player.sendPacket(new ItemList(player, false));
// Update current load status on player
final StatusUpdate su = new StatusUpdate(player);

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList(false);
}
// Send full list to avoid duplicates.
player.sendItemList(false);
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)

View File

@ -178,7 +178,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
if (playerIU != null)
{
if (newItem.getCount() > count)
if (newItem.isStackable() && (newItem.getCount() > count))
{
playerIU.addModifiedItem(newItem);
}
@ -200,10 +200,8 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
{
player.sendInventoryUpdate(playerIU);
}
else
{
player.sendItemList();
}
// Send full list to avoid duplicates.
player.sendItemList();
final Player receiver = World.getInstance().getPlayer(msg.getReceiverId());
if (receiver != null)