Compound system resetting improvements.
This commit is contained in:
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemOne(0);
|
request.setItemOne(0);
|
||||||
|
if (request.getItemTwo() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemTwo(0);
|
request.setItemTwo(0);
|
||||||
|
if (request.getItemOne() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
player.removeRequest(request.getClass());
|
player.removeRequest(request.getClass());
|
||||||
|
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
|
|||||||
{
|
{
|
||||||
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
||||||
|
|
||||||
|
private ExEnchantOneOK()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write()
|
public void write()
|
||||||
{
|
{
|
||||||
|
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemOne(0);
|
request.setItemOne(0);
|
||||||
|
if (request.getItemTwo() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemTwo(0);
|
request.setItemTwo(0);
|
||||||
|
if (request.getItemOne() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -82,7 +82,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
player.removeRequest(request.getClass());
|
player.removeRequest(request.getClass());
|
||||||
@@ -121,6 +121,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify to scripts.
|
// Notify to scripts.
|
||||||
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
|
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
|
||||||
{
|
{
|
||||||
|
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
|
|||||||
{
|
{
|
||||||
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
||||||
|
|
||||||
|
private ExEnchantOneOK()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write()
|
public void write()
|
||||||
{
|
{
|
||||||
|
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemOne(0);
|
request.setItemOne(0);
|
||||||
|
if (request.getItemTwo() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemTwo(0);
|
request.setItemTwo(0);
|
||||||
|
if (request.getItemOne() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -82,7 +82,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
player.removeRequest(request.getClass());
|
player.removeRequest(request.getClass());
|
||||||
@@ -121,6 +121,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notify to scripts.
|
// Notify to scripts.
|
||||||
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
|
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
|
||||||
{
|
{
|
||||||
|
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
|
|||||||
{
|
{
|
||||||
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
||||||
|
|
||||||
|
private ExEnchantOneOK()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write()
|
public void write()
|
||||||
{
|
{
|
||||||
|
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemOne(0);
|
request.setItemOne(0);
|
||||||
|
if (request.getItemTwo() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemTwo(0);
|
request.setItemTwo(0);
|
||||||
|
if (request.getItemOne() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
player.removeRequest(request.getClass());
|
player.removeRequest(request.getClass());
|
||||||
|
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
|
|||||||
{
|
{
|
||||||
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
||||||
|
|
||||||
|
private ExEnchantOneOK()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write()
|
public void write()
|
||||||
{
|
{
|
||||||
|
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemOne(0);
|
request.setItemOne(0);
|
||||||
|
if (request.getItemTwo() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemTwo(0);
|
request.setItemTwo(0);
|
||||||
|
if (request.getItemOne() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
player.removeRequest(request.getClass());
|
player.removeRequest(request.getClass());
|
||||||
|
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
|
|||||||
{
|
{
|
||||||
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
||||||
|
|
||||||
|
private ExEnchantOneOK()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write()
|
public void write()
|
||||||
{
|
{
|
||||||
|
@@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemOne(0);
|
request.setItemOne(0);
|
||||||
|
if (request.getItemTwo() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
|
|||||||
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setItemTwo(0);
|
request.setItemTwo(0);
|
||||||
|
if (request.getItemOne() == null)
|
||||||
|
{
|
||||||
|
player.removeRequest(request.getClass());
|
||||||
|
}
|
||||||
|
|
||||||
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lets prevent using same item twice. Also stackable item check.
|
// Lets prevent using same item twice. Also stackable item check.
|
||||||
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))
|
if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)))
|
||||||
{
|
{
|
||||||
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
|
||||||
player.removeRequest(request.getClass());
|
player.removeRequest(request.getClass());
|
||||||
|
@@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
|
|||||||
{
|
{
|
||||||
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
|
||||||
|
|
||||||
|
private ExEnchantOneOK()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write()
|
public void write()
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user