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

Adjustments for RequestExTryToPutEnchantTargetItem.

Browse Source 
Contributed by Index.
This commit is contained in:
MobiusDevelopment
2022-03-29 23:18:52 +00:00
parent 4c68b85916
commit 4a17d079eb
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
View File

@@ -27,6 +27,8 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.enchant.EnchantResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList; import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList;
@@ -70,11 +72,13 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
} }
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel()))
{ {
player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL); player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL);
player.removeRequest(request.getClass()); request.setEnchantingItem(0);
player.sendPacket(new ExPutEnchantTargetItemResult(0)); player.sendPacket(new ExPutEnchantTargetItemResult(0));
player.sendPacket(new EnchantResult(2, 0, 0));
player.sendPacket(new ExPutEnchantScrollItemResult(1));
if (scrollTemplate == null) if (scrollTemplate == null)
{ {
PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());

8
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/enchant/RequestExTryToPutEnchantTargetItem.java
View File

@@ -27,6 +27,8 @@ import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.PacketLogger; import org.l2jmobius.gameserver.network.PacketLogger;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.enchant.EnchantResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantScrollItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult; import org.l2jmobius.gameserver.network.serverpackets.enchant.ExPutEnchantTargetItemResult;
import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList; import org.l2jmobius.gameserver.network.serverpackets.enchant.single.ChangedEnchantTargetItemProbabilityList;
@@ -70,11 +72,13 @@ public class RequestExTryToPutEnchantTargetItem implements IClientIncomingPacket
} }
final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null) || (item.getEnchantLevel() >= scrollTemplate.getMaxEnchantLevel()))
{ {
player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL); player.sendPacket(SystemMessageId.DOES_NOT_FIT_STRENGTHENING_CONDITIONS_OF_THE_SCROLL);
player.removeRequest(request.getClass()); request.setEnchantingItem(0);
player.sendPacket(new ExPutEnchantTargetItemResult(0)); player.sendPacket(new ExPutEnchantTargetItemResult(0));
player.sendPacket(new EnchantResult(2, 0, 0));
player.sendPacket(new ExPutEnchantScrollItemResult(1));
if (scrollTemplate == null) if (scrollTemplate == null)
{ {
PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId()); PacketLogger.warning(getClass().getSimpleName() + ": Undefined scroll have been used id: " + scroll.getId());