BETA: DP-Part for [L6597]

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
 				{

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>

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>