BETA: DP-Part for [L6397].

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Fear.java

@@ -27,8 +27,8 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
@@ -52,7 +52,7 @@ public final class Fear extends AbstractEffect
 	@Override
 	public boolean canStart(BuffInfo info)
 	{
-		if ((info.getEffected() instanceof L2NpcInstance) || (info.getEffected() instanceof L2DefenderInstance) || (info.getEffected() instanceof L2FortCommanderInstance) || (info.getEffected() instanceof L2SiegeFlagInstance) || (info.getEffected() instanceof L2SiegeSummonInstance))
+		if ((info.getEffected() instanceof L2NpcInstance) || (info.getEffected() instanceof L2DefenderInstance) || (info.getEffected() instanceof L2FortCommanderInstance) || (info.getEffected() instanceof L2SiegeFlagInstance) || (info.getEffected() instanceof L2ServitorInstance))
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
@@ -51,11 +50,6 @@ public final class TargetMe extends AbstractEffect
 	{
 		if (info.getEffected().isPlayable())
 		{
-			if (info.getEffected() instanceof L2SiegeSummonInstance)
-			{
-				return;
-			}
-			
 			if (info.getEffected().getTarget() != info.getEffector())
 			{
 				L2PcInstance effector = info.getEffector().getActingPlayer();

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java

@@ -20,7 +20,6 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
@@ -57,11 +56,6 @@ public final class TargetMeProbability extends AbstractEffect
 	{
 		if (info.getEffected().isPlayable())
 		{
-			if (info.getEffected() instanceof L2SiegeSummonInstance)
-			{
-				return;
-			}
-			
 			if (info.getEffected().getTarget() != info.getEffector())
 			{
 				L2PcInstance effector = info.getEffector().getActingPlayer();

L2J_DataPack_BETA/dist/game/data/stats/npcs/14700-14800.xml

@@ -1488,7 +1488,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="14737" level="55" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14737" level="55" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1525,7 +1525,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14738" level="78" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14738" level="78" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1562,7 +1562,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14739" level="78" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14739" level="78" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1599,7 +1599,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14740" level="78" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14740" level="78" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1636,7 +1636,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14741" level="78" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14741" level="78" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1673,7 +1673,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14742" level="79" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14742" level="79" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1710,7 +1710,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14743" level="79" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14743" level="79" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1747,7 +1747,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14744" level="79" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14744" level="79" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1784,7 +1784,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14745" level="79" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14745" level="79" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1821,7 +1821,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14746" level="80" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14746" level="80" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1858,7 +1858,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14747" level="80" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14747" level="80" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1895,7 +1895,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14748" level="80" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14748" level="80" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1932,7 +1932,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14749" level="80" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14749" level="80" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -1969,7 +1969,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14750" level="81" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14750" level="81" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2006,7 +2006,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14751" level="81" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14751" level="81" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2043,7 +2043,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14752" level="81" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14752" level="81" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2080,7 +2080,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14753" level="81" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14753" level="81" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2117,7 +2117,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14754" level="82" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14754" level="82" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2154,7 +2154,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14755" level="82" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14755" level="82" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2191,7 +2191,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14756" level="82" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14756" level="82" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2228,7 +2228,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14757" level="82" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14757" level="82" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2265,7 +2265,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14758" level="83" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14758" level="83" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2302,7 +2302,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14759" level="83" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14759" level="83" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2339,7 +2339,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14760" level="83" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14760" level="83" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2376,7 +2376,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14761" level="83" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14761" level="83" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2413,7 +2413,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14762" level="84" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14762" level="84" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2450,7 +2450,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14763" level="84" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14763" level="84" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2487,7 +2487,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14764" level="84" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14764" level="84" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2524,7 +2524,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14765" level="85" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14765" level="85" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2561,7 +2561,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14766" level="85" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14766" level="85" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2598,7 +2598,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14767" level="85" type="L2SiegeSummon" name="Siege Golem">
+	<npc id="14767" level="85" type="L2Servitor" name="Siege Golem">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2635,7 +2635,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="14768" level="60" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14768" level="60" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2675,7 +2675,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14769" level="78" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14769" level="78" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2715,7 +2715,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14770" level="78" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14770" level="78" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2755,7 +2755,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14771" level="78" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14771" level="78" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2795,7 +2795,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14772" level="78" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14772" level="78" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2835,7 +2835,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14773" level="79" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14773" level="79" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2875,7 +2875,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14774" level="79" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14774" level="79" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2915,7 +2915,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14775" level="79" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14775" level="79" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2955,7 +2955,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14776" level="79" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14776" level="79" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -2995,7 +2995,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14777" level="80" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14777" level="80" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3035,7 +3035,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14778" level="80" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14778" level="80" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3075,7 +3075,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14779" level="80" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14779" level="80" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3115,7 +3115,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14780" level="80" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14780" level="80" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3155,7 +3155,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14781" level="81" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14781" level="81" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3195,7 +3195,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14782" level="81" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14782" level="81" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3235,7 +3235,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14783" level="81" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14783" level="81" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3275,7 +3275,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14784" level="81" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14784" level="81" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3315,7 +3315,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14785" level="82" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14785" level="82" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3355,7 +3355,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14786" level="82" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14786" level="82" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3395,7 +3395,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14787" level="82" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14787" level="82" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3435,7 +3435,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14788" level="82" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14788" level="82" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3475,7 +3475,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14789" level="83" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14789" level="83" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3515,7 +3515,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14790" level="83" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14790" level="83" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3555,7 +3555,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14791" level="83" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14791" level="83" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3595,7 +3595,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14792" level="83" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14792" level="83" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3635,7 +3635,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14793" level="84" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14793" level="84" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3675,7 +3675,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14794" level="84" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14794" level="84" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3715,7 +3715,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14795" level="84" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14795" level="84" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3755,7 +3755,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14796" level="85" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14796" level="85" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3795,7 +3795,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14797" level="85" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14797" level="85" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->
@@ -3835,7 +3835,7 @@
 			<height normal="90" />
 		</collision>
 	</npc>
-	<npc id="14798" level="85" type="L2SiegeSummon" name="Wild Hog Cannon">
+	<npc id="14798" level="85" type="L2Servitor" name="Wild Hog Cannon">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4230" level="1" /> <!-- Wild Cannon -->

L2J_DataPack_BETA/dist/game/data/stats/npcs/14800-14900.xml

@@ -1984,7 +1984,7 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="14839" level="68" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14839" level="68" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2020,7 +2020,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14840" level="78" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14840" level="78" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2056,7 +2056,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14841" level="78" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14841" level="78" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2092,7 +2092,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14842" level="78" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14842" level="78" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2128,7 +2128,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14843" level="78" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14843" level="78" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2164,7 +2164,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14844" level="79" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14844" level="79" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2200,7 +2200,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14845" level="79" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14845" level="79" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2236,7 +2236,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14846" level="79" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14846" level="79" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2272,7 +2272,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14847" level="79" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14847" level="79" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2308,7 +2308,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14848" level="80" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14848" level="80" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2344,7 +2344,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14849" level="80" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14849" level="80" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2380,7 +2380,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14850" level="80" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14850" level="80" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2416,7 +2416,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14851" level="80" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14851" level="80" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2452,7 +2452,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14852" level="81" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14852" level="81" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2488,7 +2488,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14853" level="81" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14853" level="81" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2524,7 +2524,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14854" level="81" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14854" level="81" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2560,7 +2560,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14855" level="81" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14855" level="81" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2596,7 +2596,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14856" level="82" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14856" level="82" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2632,7 +2632,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14857" level="82" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14857" level="82" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2668,7 +2668,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14858" level="82" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14858" level="82" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2704,7 +2704,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14859" level="82" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14859" level="82" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2740,7 +2740,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14860" level="83" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14860" level="83" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2776,7 +2776,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14861" level="83" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14861" level="83" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2812,7 +2812,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14862" level="83" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14862" level="83" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2848,7 +2848,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14863" level="83" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14863" level="83" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2884,7 +2884,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14864" level="84" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14864" level="84" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2920,7 +2920,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14865" level="84" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14865" level="84" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2956,7 +2956,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14866" level="84" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14866" level="84" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -2992,7 +2992,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14867" level="85" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14867" level="85" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -3028,7 +3028,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14868" level="85" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14868" level="85" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>
@@ -3064,7 +3064,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="14869" level="85" type="L2SiegeSummon" name="Swoop Cannon">
+	<npc id="14869" level="85" type="L2Servitor" name="Swoop Cannon">
 		<!-- Confirmed CT2.5 -->
 		<race>SIEGE_WEAPON</race>
 		<sex>MALE</sex>