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 06d0f3ff538aeb1c7174b559a40dc1ab44ae0b1c..d8629ad240c4b25a1a0227ebb265deae0f92f4f8 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 @@ -21,7 +21,6 @@ package handlers.itemhandlers; import com.l2jserver.gameserver.ai.CtrlIntention; import com.l2jserver.gameserver.handler.IItemHandler; import com.l2jserver.gameserver.model.actor.L2Playable; -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; @@ -71,7 +70,6 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final L2PcInstance activeChar = playable.getActingPlayer(); for (SkillHolder skillInfo : skills) { if (skillInfo == null) @@ -124,11 +122,6 @@ public class ItemSkillsTemplate implements IItemHandler if (itemSkill.isSimultaneousCast() || ((item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) && itemSkill.isStatic())) { playable.doSimultaneousCast(itemSkill); - // Summons should be affected by herbs too, self time effect is handled at L2Effect constructor - if (!playable.isSummon() && activeChar.hasSummon()) - { - activeChar.getSummon().doSimultaneousCast(itemSkill); - } } else { diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml index 7919ed09a64adf070d04b6cbe8a7cc697b6d1825..e3306d80e78d798976c9beb40e642575a46e4b90 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml @@ -941,6 +941,7 @@ <set name="operateType" val="A1" /> <set name="reuseDelay" val="2000" /> <set name="targetType" val="SELF" /> + <set name="isRecoveryHerb" val="true" /> <cond msgId="113" addName="1"> <player flyMounted="false" /> </cond> @@ -962,6 +963,7 @@ <set name="operateType" val="A1" /> <set name="reuseDelay" val="2000" /> <set name="targetType" val="SELF" /> + <set name="isRecoveryHerb" val="true" /> <cond msgId="113" addName="1"> <player flyMounted="false" /> </cond> @@ -1630,6 +1632,7 @@ <set name="operateType" val="A1" /> <set name="reuseDelay" val="2000" /> <set name="targetType" val="SELF" /> + <set name="isRecoveryHerb" val="true" /> <cond msgId="113" addName="1"> <player flyMounted="false" /> </cond> @@ -1649,6 +1652,7 @@ <set name="operateType" val="A1" /> <set name="reuseDelay" val="2000" /> <set name="targetType" val="SELF" /> + <set name="isRecoveryHerb" val="true" /> <cond msgId="113" addName="1"> <player flyMounted="false" /> </cond> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml index 7e18d7f11018811d3a4085aa0d016320c3aecb90..371a1275d9fabd0ed6c901fabd2cca01e4d945b8 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02400-02499.xml @@ -1831,6 +1831,7 @@ <set name="operateType" val="A1" /> <set name="reuseDelay" val="2000" /> <set name="targetType" val="SELF" /> + <set name="isRecoveryHerb" val="true" /> <cond msgId="113" addName="1"> <player flyMounted="false" /> </cond> @@ -1848,6 +1849,7 @@ <set name="operateType" val="A1" /> <set name="reuseDelay" val="2000" /> <set name="targetType" val="SELF" /> + <set name="isRecoveryHerb" val="true" /> <cond msgId="113" addName="1"> <player flyMounted="false" /> </cond>