Support for combining stackable items.
This commit is contained in:
parent
193d43173b
commit
911e28b4f8
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
@ -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;
|
||||||
|
@ -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());
|
||||||
|
Loading…
Reference in New Issue
Block a user