Support for combining stackable items.

This commit is contained in:
MobiusDevelopment 2019-12-06 23:54:09 +00:00
parent 193d43173b
commit 911e28b4f8
30 changed files with 60 additions and 60 deletions

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());

View File

@ -81,8 +81,8 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(ExEnchantTwoFail.STATIC_PACKET); client.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
return; return;

View File

@ -83,8 +83,8 @@ public class RequestNewEnchantTry implements IClientIncomingPacket
return; return;
} }
// Lets prevent using same item twice // Lets prevent using same item twice. Also stackable item check.
if (itemOne.getObjectId() == itemTwo.getObjectId()) if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)))
{ {
client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); client.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());