lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compound system resetting improvements.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-11-23 00:05:19 +00:00
parent 677a27fcd9
commit 207501a2f8
30 changed files with 98 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
}
// 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);
return;

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
if (request.getItemTwo() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}

5
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
if (request.getItemOne() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
}
// 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.removeRequest(request.getClass());

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
private ExEnchantOneOK()
{
}
@Override
public void write()
{

2
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
}
// 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);
return;

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
if (request.getItemTwo() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}

5
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
if (request.getItemOne() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}

3
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantTry implements ClientPacket
}
// 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.removeRequest(request.getClass());
@ -121,6 +121,7 @@ public class RequestNewEnchantTry implements ClientPacket
{
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
// Notify to scripts.
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
{

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
private ExEnchantOneOK()
{
}
@Override
public void write()
{

2
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
}
// 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);
return;

5
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
if (request.getItemTwo() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}

5
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
if (request.getItemOne() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}

3
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -82,7 +82,7 @@ public class RequestNewEnchantTry implements ClientPacket
}
// 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.removeRequest(request.getClass());
@ -121,6 +121,7 @@ public class RequestNewEnchantTry implements ClientPacket
{
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId()));
}
// Notify to scripts.
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))
{

4
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
private ExEnchantOneOK()
{
}
@Override
public void write()
{

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
}
// 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);
return;

5
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
if (request.getItemTwo() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}

5
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
if (request.getItemOne() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
}
// 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.removeRequest(request.getClass());

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
private ExEnchantOneOK()
{
}
@Override
public void write()
{

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
}
// 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);
return;

5
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
if (request.getItemTwo() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}

5
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
if (request.getItemOne() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
}
// 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.removeRequest(request.getClass());

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
private ExEnchantOneOK()
{
}
@Override
public void write()
{

2
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java
View File

@ -83,7 +83,7 @@ public class RequestNewEnchantPushTwo implements ClientPacket
}
// 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);
return;

5
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveOne implements ClientPacket
player.sendPacket(ExEnchantOneRemoveFail.STATIC_PACKET);
return;
}
request.setItemOne(0);
if (request.getItemTwo() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantOneRemoveOK.STATIC_PACKET);
}

5
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java
View File

@ -76,7 +76,12 @@ public class RequestNewEnchantRemoveTwo implements ClientPacket
player.sendPacket(ExEnchantTwoRemoveFail.STATIC_PACKET);
return;
}
request.setItemTwo(0);
if (request.getItemOne() == null)
{
player.removeRequest(request.getClass());
}
player.sendPacket(ExEnchantTwoRemoveOK.STATIC_PACKET);
}

2
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java
View File

@ -79,7 +79,7 @@ public class RequestNewEnchantTry implements ClientPacket
}
// 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.removeRequest(request.getClass());

4
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantOneOK.java
View File

@ -26,6 +26,10 @@ public class ExEnchantOneOK extends ServerPacket
{
public static final ExEnchantOneOK STATIC_PACKET = new ExEnchantOneOK();
private ExEnchantOneOK()
{
}
@Override
public void write()
{