Skip to content
Snippets Groups Projects
Commit 744631a1 authored by Zoey76's avatar Zoey76
Browse files

BETA: Fix for extractable items not being consumed.

Patch by: Sdw
Reviewed by: Nos, Zoey76, jurchiks
Reported by: Conteur, CostyKiller, d!g0, snacks
parent 0d14c0eb
No related branches found
No related tags found
No related merge requests found
......@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.items.type.L2ActionType;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
......@@ -102,9 +103,10 @@ public class ItemSkillsTemplate implements IItemHandler
return false;
}
if ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0) && (item.isPotion() || item.isElixir() || itemSkill.isSimultaneousCast()))
final boolean isCapsuleItem = item.getItem().getDefaultAction() == L2ActionType.capsule;
if (isCapsuleItem || ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0) && (item.isPotion() || item.isElixir() || itemSkill.isSimultaneousCast())))
{
if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), playable, false))
if (!playable.destroyItem("Consume", item.getObjectId(), isCapsuleItem && (itemSkill.getItemConsume() == 0) ? 1 : itemSkill.getItemConsume(), playable, false))
{
playable.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment