From 5eae3d0b621dca4b21c156ba299ccdc6cea279f2 Mon Sep 17 00:00:00 2001 From: Zoey76 <zoey_76@msn.com> Date: Wed, 9 May 2012 18:21:14 +0000 Subject: [PATCH] BETA: Minor fix in ItemSkillTemplate, for items used by pets. * Thanks for report and tests: * DareStrike * thecast * MELERIX * Closed #5251 --- .../scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 8fd169f3b5..c28df5d6d0 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -102,7 +102,7 @@ public class ItemSkillsTemplate implements IItemHandler if ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0) && (itemSkill.isPotion() || itemSkill.isSimultaneousCast())) { - if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false)) + if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), playable, false)) { activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS); return false; @@ -126,8 +126,7 @@ public class ItemSkillsTemplate implements IItemHandler case 2037: case 26025: case 26026: - int buffId = activeChar._shortBuffTaskSkillId; - // greater healing potions + final int buffId = activeChar._shortBuffTaskSkillId; if ((skillId == 2037) || (skillId == 26025)) { activeChar.shortBuffStatusUpdate(skillId, skillLvl, itemSkill.getBuffDuration() / 1000); @@ -135,7 +134,6 @@ public class ItemSkillsTemplate implements IItemHandler else if (((skillId == 2032) || (skillId == 26026)) && (buffId != 2037) && (buffId != 26025)) { activeChar.shortBuffStatusUpdate(skillId, skillLvl, itemSkill.getBuffDuration() / 1000); - // lesser healing potions } else { @@ -169,7 +167,7 @@ public class ItemSkillsTemplate implements IItemHandler // Consume. if ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0)) { - if (!activeChar.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false)) + if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false)) { activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS); return false; -- GitLab