From a4b2d5053991a2fff92ad5da8163a4b2248d0253 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 15 Jul 2016 12:52:28 +0000 Subject: [PATCH] Fixed pet summoning. --- .../handlers/itemhandlers/ItemSkillsTemplate.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 15fae25c70..d0dcacf6ad 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.effects.L2EffectType; import com.l2jmobius.gameserver.model.holders.ItemSkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -83,7 +84,7 @@ public class ItemSkillsTemplate implements IItemHandler hasConsumeSkill = true; } - if (!itemSkill.checkCondition(playable, playable.getTarget())) + if (!itemSkill.hasEffectType(L2EffectType.SUMMON_PET) && !itemSkill.checkCondition(playable, playable.getTarget())) { continue; } @@ -112,7 +113,12 @@ public class ItemSkillsTemplate implements IItemHandler playable.sendPacket(sm); } - if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + if (playable.isPlayer() && itemSkill.hasEffectType(L2EffectType.SUMMON_PET)) + { + playable.doCast(itemSkill); + successfulUse = true; + } + else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true;