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

Fixed click on reset button after compound failed.

Browse Source 
Contributed by Fakee.
This commit is contained in:
MobiusDevelopment
2022-12-20 07:32:41 +00:00
parent 6c0688a61d
commit 4d843dc0c0
2 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail; import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail; import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess; import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess;
@@ -111,20 +112,41 @@ public class RequestNewEnchantTry implements ClientPacket
final boolean success = random <= combinationItem.getChance(); final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE); final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
// Add item (early).
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
// Send success or fail packet. // Send success or fail packet.
if (success) if (success)
{ {
player.sendPacket(new ExEnchantSucess(rewardItem.getId())); player.sendPacket(new ExEnchantSucess(item.getId()));
} }
else else
{ {
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.sendPacket(new ExEnchantFail(item.getId(), itemTwo.getId()));
} }
// Take required items and add result item. // Take required items.
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true))) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true)))
{ {
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true); final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(item);
if (itemOne.isStackable() && (itemOne.getCount() > 0))
{
iu.addModifiedItem(itemOne);
}
else
{
iu.addRemovedItem(itemOne);
}
if (itemTwo.isStackable() && (itemTwo.getCount() > 0))
{
iu.addModifiedItem(itemTwo);
}
else
{
iu.addRemovedItem(itemTwo);
}
player.sendInventoryUpdate(iu);
// Notify to scripts. // Notify to scripts.
if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND)) if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_COMPOUND))

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

@@ -27,6 +27,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail; import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail; import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantOneFail;
import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess; import org.l2jmobius.gameserver.network.serverpackets.compound.ExEnchantSucess;
@@ -108,20 +109,41 @@ public class RequestNewEnchantTry implements ClientPacket
final boolean success = random <= combinationItem.getChance(); final boolean success = random <= combinationItem.getChance();
final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE); final CombinationItemReward rewardItem = combinationItem.getReward(success ? CombinationItemType.ON_SUCCESS : CombinationItemType.ON_FAILURE);
// Add item (early).
final Item item = player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true);
// Send success or fail packet. // Send success or fail packet.
if (success) if (success)
{ {
player.sendPacket(new ExEnchantSucess(rewardItem.getId())); player.sendPacket(new ExEnchantSucess(item.getId()));
} }
else else
{ {
player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.sendPacket(new ExEnchantFail(item.getId(), itemTwo.getId()));
} }
// Take required items and add result item. // Take required items.
if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true))) if (player.destroyItem("Compound-Item-One", itemOne, 1, null, true) && player.destroyItem("Compound-Item-Two", itemTwo, 1, null, true) && ((combinationItem.getCommission() <= 0) || player.reduceAdena("Compound-Commission", combinationItem.getCommission(), player, true)))
{ {
player.addItem("Compound-Result", rewardItem.getId(), rewardItem.getCount(), null, true); final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(item);
if (itemOne.isStackable() && (itemOne.getCount() > 0))
{
iu.addModifiedItem(itemOne);
}
else
{
iu.addRemovedItem(itemOne);
}
if (itemTwo.isStackable() && (itemTwo.getCount() > 0))
{
iu.addModifiedItem(itemTwo);
}
else
{
iu.addRemovedItem(itemTwo);
}
player.sendInventoryUpdate(iu);
} }
player.removeRequest(request.getClass()); player.removeRequest(request.getClass());