BETA: Datapack part for [L5693].

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chests.java

@@ -168,7 +168,7 @@ public class Chests extends AbstractNpcAI
 				}
 				else
 				{
-					L2Character originalCaster = isPet ? caster.getPet() : caster;
+					L2Character originalCaster = isPet ? caster.getSummon() : caster;
 					chest.setRunning();
 					chest.addDamageHate(originalCaster, 0, 999);
 					chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalCaster);
@@ -203,7 +203,7 @@ public class Chests extends AbstractNpcAI
 				{
 					// if this weren't a box, upon interaction start the mimic behaviors...
 					// todo: perhaps a self-buff (skill id 4245) with random chance goes here?
-					L2Character originalAttacker = isPet ? attacker.getPet() : attacker;
+					L2Character originalAttacker = isPet ? attacker.getSummon() : attacker;
 					chest.setRunning();
 					chest.addDamageHate(originalAttacker, 0, (damage * 100) / (chest.getLevel() + 7));
 					chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalAttacker);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java

@@ -56,7 +56,7 @@ public class FairyTrees extends AbstractNpcAI
 			for (int i = 0; i < 20; i++)
 			{
 				L2Attackable newNpc = (L2Attackable) addSpawn(27189, npc.getX(), npc.getY(), npc.getZ(), 0, false, 30000);
-				L2Character originalKiller = isPet ? killer.getPet() : killer;
+				L2Character originalKiller = isPet ? killer.getSummon() : killer;
 				newNpc.setRunning();
 				newNpc.addDamageHate(originalKiller, 0, 999);
 				newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalKiller);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/GiantScouts.java

@@ -51,7 +51,7 @@ public class GiantScouts extends AbstractNpcAI
 	@Override
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isPet)
 	{
-		L2Character target = isPet ? player.getPet() : player;
+		L2Character target = isPet ? player.getSummon() : player;
 		
 		if (GeoData.getInstance().canSeeTarget(npc, target))
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java

@@ -75,9 +75,9 @@ public final class L2AttackableAIScript extends QuestJython
 		
 		int skillAggroPoints = skill.getAggroPoints();
 		
-		if (caster.getPet() != null)
+		if (caster.hasSummon())
 		{
-			if ((targets.length == 1) && Util.contains(targets, caster.getPet()))
+			if ((targets.length == 1) && Util.contains(targets, caster.getSummon()))
 			{
 				skillAggroPoints = 0;
 			}
@@ -92,7 +92,7 @@ public final class L2AttackableAIScript extends QuestJython
 				{
 					if ((npcTarget == skillTarget) || (npc == skillTarget))
 					{
-						L2Character originalCaster = isPet ? caster.getPet() : caster;
+						L2Character originalCaster = isPet ? caster.getSummon() : caster;
 						attackable.addDamageHate(originalCaster, 0, (skillAggroPoints * 150) / (attackable.getLevel() + 7));
 					}
 				}
@@ -110,7 +110,7 @@ public final class L2AttackableAIScript extends QuestJython
 			return null;
 		}
 		
-		L2Character originalAttackTarget = (isPet ? attacker.getPet() : attacker);
+		L2Character originalAttackTarget = (isPet ? attacker.getSummon() : attacker);
 		if (attacker.isInParty() && attacker.getParty().isInDimensionalRift())
 		{
 			byte riftType = attacker.getParty().getDimensionalRift().getType();
@@ -137,7 +137,7 @@ public final class L2AttackableAIScript extends QuestJython
 			return null;
 		}
 		
-		L2Character target = isPet ? player.getPet() : player;
+		L2Character target = isPet ? player.getSummon() : player;
 		
 		((L2Attackable) npc).addDamageHate(target, 0, 1);
 		
@@ -162,7 +162,7 @@ public final class L2AttackableAIScript extends QuestJython
 		{
 			L2Attackable attackable = (L2Attackable) npc;
 			
-			L2Character originalAttacker = isPet ? attacker.getPet() : attacker;
+			L2Character originalAttacker = isPet ? attacker.getSummon() : attacker;
 			attackable.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, originalAttacker);
 			attackable.addDamageHate(originalAttacker, damage, (damage * 100) / (attackable.getLevel() + 7));
 		}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java

@@ -67,22 +67,22 @@ public class PlainsOfLizardman extends AbstractNpcAI
 		if ((player != null) && !player.isAlikeDead())
 		{
 			boolean isPet = false;
-			if (event.endsWith("_pet") && (player.getPet() != null) && !player.getPet().isDead())
+			if (event.endsWith("_pet") && player.hasSummon() && !player.getSummon().isDead())
 			{
 				isPet = true;
 			}
 			
 			if (event.startsWith("rainbow_frog"))
 			{
-				triggerSkill(npc, isPet ? player.getPet() : player, RAINBOW_FROG_SKILL, 1);
+				triggerSkill(npc, isPet ? player.getSummon() : player, RAINBOW_FROG_SKILL, 1);
 			}
 			else if (event.startsWith("energy_plant"))
 			{
-				triggerSkill(npc, isPet ? player.getPet() : player, ENERGY_PLANT_SKILL, 1);
+				triggerSkill(npc, isPet ? player.getSummon() : player, ENERGY_PLANT_SKILL, 1);
 			}
 			else if (event.startsWith("sticky_mushroom"))
 			{
-				triggerSkill(npc, isPet ? player.getPet() : player, STICKY_MUSHROOM_SKILL, 1);
+				triggerSkill(npc, isPet ? player.getSummon() : player, STICKY_MUSHROOM_SKILL, 1);
 			}
 			else if (event.startsWith("fantasy_mushroom"))
 			{
@@ -93,7 +93,7 @@ public class PlainsOfLizardman extends AbstractNpcAI
 					if ((target != null) && (target instanceof L2Attackable) && (target.getAI() != null))
 					{
 						skill.getEffects(npc, target);
-						attackPlayer((L2Attackable) target, isPet ? player.getPet() : player);
+						attackPlayer((L2Attackable) target, isPet ? player.getSummon() : player);
 					}
 				}
 				npc.doDie(player);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java

@@ -100,7 +100,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI
 					}
 					npc.deleteMe();
 					L2Attackable newNpc = (L2Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
-					L2Character originalAttacker = isPet ? attacker.getPet() : attacker;
+					L2Character originalAttacker = isPet ? attacker.getSummon() : attacker;
 					newNpc.setRunning();
 					newNpc.addDamageHate(originalAttacker, 0, 500);
 					newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalAttacker);

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/PrisonGuards.java

@@ -134,7 +134,7 @@ public class PrisonGuards extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance player, L2Skill skill, L2Object[] targets, boolean isPet)
 	{
-		L2Character caster = isPet ? player.getPet() : player;
+		L2Character caster = isPet ? player.getSummon() : player;
 		
 		if (npc.getNpcId() == GUARD2)
 		{
@@ -153,7 +153,7 @@ public class PrisonGuards extends AbstractNpcAI
 	@Override
 	public String onAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isPet)
 	{
-		L2Character target = isPet ? player.getPet() : player;
+		L2Character target = isPet ? player.getSummon() : player;
 		
 		if (npc.getNpcId() == GUARD2)
 		{
@@ -187,7 +187,7 @@ public class PrisonGuards extends AbstractNpcAI
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isPet)
 	{
-		L2Character attacker = isPet ? player.getPet() : player;
+		L2Character attacker = isPet ? player.getSummon() : player;
 		
 		_firstAttacked = true;
 		
@@ -252,7 +252,7 @@ public class PrisonGuards extends AbstractNpcAI
 		L2Skill skill = SkillTable.getInstance().getInfo(effectId, isSpell ? 9 : 1);
 		if (skill != null)
 		{
-			npc.setTarget(isSummon ? player.getPet() : player);
+			npc.setTarget(isSummon ? player.getSummon() : player);
 			npc.doCast(skill);
 		}
 	}

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java

@@ -138,7 +138,7 @@ public class SummonMinions extends AbstractNpcAI
 				{
 					if (isPet)
 					{
-						attacker = (attacker).getPet().getOwner();
+						attacker = attacker.getSummon().getOwner();
 					}
 					if (attacker.getParty() != null)
 					{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/DarkWaterDragon.java

@@ -147,7 +147,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 			{
 				MY_TRACKING_SET.add(npcObjId);
 				// Spawn first 5 shades on first attack on Dark Water Dragon
-				L2Character originalAttacker = isPet ? attacker.getPet() : attacker;
+				L2Character originalAttacker = isPet ? attacker.getSummon() : attacker;
 				spawnShade(originalAttacker, SHADE1, npc.getX() + 100, npc.getY() + 100, npc.getZ());
 				spawnShade(originalAttacker, SHADE2, npc.getX() + 100, npc.getY() - 100, npc.getZ());
 				spawnShade(originalAttacker, SHADE1, npc.getX() - 100, npc.getY() + 100, npc.getZ());
@@ -158,7 +158,7 @@ public class DarkWaterDragon extends AbstractNpcAI
 			{
 				SECOND_SPAWN.add(npcObjId);
 				// Spawn second 5 shades on half hp of on Dark Water Dragon
-				L2Character originalAttacker = isPet ? attacker.getPet() : attacker;
+				L2Character originalAttacker = isPet ? attacker.getSummon() : attacker;
 				spawnShade(originalAttacker, SHADE2, npc.getX() + 100, npc.getY() + 100, npc.getZ());
 				spawnShade(originalAttacker, SHADE1, npc.getX() + 100, npc.getY() - 100, npc.getZ());
 				spawnShade(originalAttacker, SHADE2, npc.getX() - 100, npc.getY() + 100, npc.getZ());

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/NecromancerValley.java

@@ -45,7 +45,7 @@ public class NecromancerValley extends AbstractNpcAI
 	{
 		if (Rnd.get(100) < 20)
 		{
-			L2Character attacker = isPet ? killer.getPet() : killer;
+			L2Character attacker = isPet ? killer.getSummon() : killer;
 			L2Attackable Orc = (L2Attackable) addSpawn(EXPLODING_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
 			Orc.setRunning();
 			Orc.addDamageHate(attacker, 0, 600);
@@ -65,7 +65,7 @@ public class NecromancerValley extends AbstractNpcAI
 	{
 		if (Rnd.get(100) < 1)
 		{
-			L2Character player = isPet ? attacker.getPet() : attacker;
+			L2Character player = isPet ? attacker.getSummon() : attacker;
 			L2Attackable Orc = (L2Attackable) addSpawn(EXPLODING_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
 			Orc.setRunning();
 			Orc.addDamageHate(player, 0, 600);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Orfen.java

@@ -241,7 +241,7 @@ public class Orfen extends AbstractNpcAI
 	{
 		if (npc.getNpcId() == ORFEN)
 		{
-			L2Character originalCaster = isPet ? caster.getPet() : caster;
+			L2Character originalCaster = isPet ? caster.getSummon() : caster;
 			if ((skill.getAggroPoints() > 0) && (getRandom(5) == 0) && npc.isInsideRadius(originalCaster, 1000, false, false))
 			{
 				NpcSay packet = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getNpcId(), TEXT[getRandom(4)]);

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java

@@ -273,7 +273,7 @@ public class QueenAnt extends AbstractNpcAI
 		if (isPet)
 		{
 			isMage = false;
-			character = player.getPet();
+			character = player.getSummon();
 		}
 		else
 		{

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Zaken.java

@@ -802,7 +802,7 @@ public class Zaken extends AbstractNpcAI
 					npc.doCast(SkillTable.getInstance().getInfo(4258, 1));
 				}
 			}
-			L2Character originalAttacker = isPet ? attacker.getPet() : attacker;
+			L2Character originalAttacker = isPet ? attacker.getSummon() : attacker;
 			int hate = (int) (((damage / npc.getMaxHp()) / 0.05) * 20000);
 			((L2Attackable) npc).addDamageHate(originalAttacker, 0, hate);
 			if (getRandom(10) < 1)
@@ -966,7 +966,7 @@ public class Zaken extends AbstractNpcAI
 		{
 			if (_Zone.isInsideZone(npc))
 			{
-				L2Character target = isPet ? player.getPet() : player;
+				L2Character target = isPet ? player.getSummon() : player;
 				((L2Attackable) npc).addDamageHate(target, 1, 200);
 			}
 			if ((player.getZ() > (npc.getZ() - 100)) && (player.getZ() < (npc.getZ() + 100)))

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -719,9 +719,9 @@ public class RainbowSpringsChateau extends Quest
 			if (pc != null)
 			{
 				pc.stopAllEffects();
-				if (pc.getPet() != null)
+				if (pc.hasSummon())
 				{
-					pc.getPet().unSummon(pc);
+					pc.getSummon().unSummon(pc);
 				}
 				pc.teleToLocation(ARENAS[arena][0], ARENAS[arena][1], ARENAS[arena][2]);
 			}

L2J_DataPack_BETA/dist/game/data/scripts/custom/IOPRace/IOPRace.java

@@ -70,8 +70,8 @@ public class IOPRace extends Quest
 		{
 			// clean old data
 			player.stopSkillEffects(5239);
-			if (player.getPet() != null)
-				player.getPet().stopSkillEffects(5239);
+			if (player.hasSummon())
+				player.getSummon().stopSkillEffects(5239);
 			
 			st.takeItems(STAMP, -1);
 			st.set("1st", "0");
@@ -83,8 +83,8 @@ public class IOPRace extends Quest
 			if (skill != null)
 			{
 				skill.getEffects(npc, player);
-				if (player.getPet() != null)
-					skill.getEffects(npc, player.getPet());
+				if (player.hasSummon())
+					skill.getEffects(npc, player.getSummon());
 			}
 			
 			startQuestTimer("timer", 1800000, null, null); // 30 min

L2J_DataPack_BETA/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java

@@ -18,7 +18,6 @@ import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
@@ -139,13 +138,13 @@ public class GiftOfVitality extends Quest
 			{
 				htmltext = "4306-nolevel.htm";
 			}
-			else if ((player.getPet() == null) || !(player.getPet() instanceof L2ServitorInstance))
+			else if (!player.hasSummon() || !player.getSummon().isServitor())
 			{
 				htmltext = "4306-nosummon.htm";
 			}
 			else
 			{
-				npc.setTarget(player.getPet());
+				npc.setTarget(player.getSummon());
 				npc.doCast(SkillTable.getInstance().getInfo(5627, 1)); // Wind Walk
 				npc.doCast(SkillTable.getInstance().getInfo(5628, 1)); // Shield
 				npc.doCast(SkillTable.getInstance().getInfo(5637, 1)); // Magic Barrier

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
 
-
 /**
  * @author evill33t, GodKratos
  */
@@ -105,11 +104,11 @@ public class AdminInstance implements IAdminCommandHandler
 					L2PcInstance player = (L2PcInstance) target;
 					player.sendMessage("Admin set your instance to:" + val);
 					player.teleToLocation(player.getX(), player.getY(), player.getZ());
-					L2Summon pet = player.getPet();
-					if (pet != null)
+					L2Summon pet = player.getSummon();
+					if (player.hasSummon())
 					{
-						pet.setInstanceId(val);
-						pet.teleToLocation(pet.getX(), pet.getY(), pet.getZ());
+						player.getSummon().setInstanceId(val);
+						player.getSummon().teleToLocation(player.getSummon().getLocation(), false);
 						player.sendMessage("Admin set " + pet.getName() + "'s instance to:" + val);
 					}
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java

@@ -51,9 +51,9 @@ public class AdminRide implements IAdminCommandHandler
 		
 		if (command.startsWith("admin_ride"))
 		{		
-			if (player.isMounted() || player.getPet() != null)
+			if (player.isMounted() || player.hasSummon())
 			{
-				activeChar.sendMessage("Target already have a pet.");
+				activeChar.sendMessage("Target already have a summon.");
 				return false;
 			}
 			if (command.startsWith("admin_ride_wyvern"))

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java

@@ -261,7 +261,7 @@ public class OlympiadManagerLink implements IBypassHandler
 						activeChar.olyBuff--;
 						target.broadcastPacket(new MagicSkillUse(target, activeChar, skill.getId(), skill.getLevel(), 0, 0));
 						skill.getEffects(activeChar, activeChar);
-						L2Summon summon = activeChar.getPet();
+						L2Summon summon = activeChar.getSummon();
 						if (summon != null)
 						{
 							target.broadcastPacket(new MagicSkillUse(target, summon, skill.getId(), skill.getLevel(), 0, 0));

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java

@@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler
 	
 	public static final void tryRentPet(L2PcInstance player, int val)
 	{
-		if ((player == null) || (player.getPet() != null) || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
+		if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
 		{
 			return;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RideWyvern.java

@@ -61,7 +61,7 @@ public class RideWyvern implements IBypassHandler
 			return false;
 		}
 		
-		if (activeChar.getPet() == null)
+		if (!activeChar.hasSummon())
 		{
 			if (activeChar.isMounted())
 			{
@@ -72,17 +72,17 @@ public class RideWyvern implements IBypassHandler
 				activeChar.sendMessage("Summon your Strider first.");
 			}
 		}
-		else if (Util.contains(STRIDERS, activeChar.getPet().getNpcId()))
+		else if (Util.contains(STRIDERS, activeChar.getSummon().getNpcId()))
 		{
 			if ((activeChar.getInventory().getItemByItemId(1460) != null) && (activeChar.getInventory().getItemByItemId(1460).getCount() >= 25))
 			{
-				if (activeChar.getPet().getLevel() < 55)
+				if (activeChar.getSummon().getLevel() < 55)
 				{
 					activeChar.sendMessage("Your Strider Has not reached the required level.");
 				}
 				else
 				{
-					activeChar.getPet().unSummon(activeChar);
+					activeChar.getSummon().unSummon(activeChar);
 					if (activeChar.mount(12621, 0, true))
 					{
 						activeChar.getInventory().destroyItemByItemId("Wyvern", 1460, 25, activeChar, npc);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.L2HelperBuff;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
 
@@ -87,13 +86,13 @@ public class SupportMagic implements IBypassHandler
 		
 		if (isSummon)
 		{
-			if ((player.getPet() == null) || !(player.getPet() instanceof L2ServitorInstance))
+			if (!player.hasSummon() || !player.getSummon().isServitor())
 			{
 				String content = "<html><body>Only servitors can receive this Support Magic. If you do not have a servitor, you cannot access these spells.</body></html>";
 				npc.insertObjectIdAndShowChatWindow(player, content);
 				return true;
 			}
-			npc.setTarget(player.getPet());
+			npc.setTarget(player.getSummon());
 		}
 		else
 		{

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

@@ -45,7 +45,7 @@ public class ServitorShare extends L2Effect
 		L2Effect[] effects = null;
 		if (getEffected().isPlayer())
 		{
-			L2Summon summon = getEffector().getPet();
+			L2Summon summon = getEffector().getSummon();
 			if (summon != null)
 			{
 				effects = summon.getAllEffects();

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

@@ -74,7 +74,7 @@ public class SignetAntiSummon extends L2Effect
 					else
 						owner = cha.getActingPlayer();
 					
-					if (owner != null && owner.getPet() != null)
+					if (owner != null && owner.hasSummon())
 					{
 						if (mpConsume > getEffector().getCurrentMp())
 						{
@@ -83,7 +83,7 @@ public class SignetAntiSummon extends L2Effect
 						}
 						
 						getEffector().reduceCurrentMp(mpConsume);
-						owner.getPet().unSummon(owner);
+						owner.getSummon().unSummon(owner);
 						owner.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, getEffector());
 					}
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java

@@ -19,7 +19,6 @@ import java.util.logging.Level;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -42,23 +41,21 @@ public class BeastSoulShot implements IItemHandler
 			return false;
 		}
 		
-		L2PcInstance activeOwner = playable.getActingPlayer();
-		L2Summon activePet = activeOwner.getPet();
-		
-		if (activePet == null)
+		final L2PcInstance activeOwner = playable.getActingPlayer();
+		if (activeOwner.hasSummon())
 		{
 			activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
 			return false;
 		}
 		
-		if (activePet.isDead())
+		if (activeOwner.getSummon().isDead())
 		{
 			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET);
 			return false;
 		}
 		
 		final int itemId = item.getItemId();
-		final short shotConsumption = activePet.getSoulShotsPerHit();
+		final short shotConsumption = activeOwner.getSummon().getSoulShotsPerHit();
 		final long shotCount = item.getCount();
 		final SkillHolder[] skills = item.getItem().getSkills();
 		
@@ -78,7 +75,7 @@ public class BeastSoulShot implements IItemHandler
 			return false;
 		}
 		
-		if (activePet.isChargedShot(ShotType.SOULSHOTS))
+		if (activeOwner.getSummon().isChargedShot(ShotType.SOULSHOTS))
 		{
 			// SoulShots are already active.
 			return false;
@@ -96,9 +93,9 @@ public class BeastSoulShot implements IItemHandler
 		
 		// Pet uses the power of spirit.
 		activeOwner.sendPacket(SystemMessageId.PET_USE_SPIRITSHOT);
-		activePet.setChargedShot(ShotType.SOULSHOTS, true);
+		activeOwner.getSummon().setChargedShot(ShotType.SOULSHOTS, true);
 		
-		Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
+		Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activeOwner.getSummon(), activeOwner.getSummon(), skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
 		return true;
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java

@@ -19,7 +19,6 @@ import java.util.logging.Level;
 import com.l2jserver.gameserver.handler.IItemHandler;
 import com.l2jserver.gameserver.model.ShotType;
 import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -42,16 +41,14 @@ public class BeastSpiritShot implements IItemHandler
 			return false;
 		}
 		
-		L2PcInstance activeOwner = playable.getActingPlayer();
-		L2Summon activePet = activeOwner.getPet();
-		
-		if (activePet == null)
+		final L2PcInstance activeOwner = playable.getActingPlayer();
+		if (activeOwner.hasSummon())
 		{
 			activeOwner.sendPacket(SystemMessageId.PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME);
 			return false;
 		}
 		
-		if (activePet.isDead())
+		if (activeOwner.getSummon().isDead())
 		{
 			activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET);
 			return false;
@@ -59,7 +56,7 @@ public class BeastSpiritShot implements IItemHandler
 		
 		final int itemId = item.getItemId();
 		final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these!
-		final short shotConsumption = activePet.getSpiritShotsPerHit();
+		final short shotConsumption = activeOwner.getSummon().getSpiritShotsPerHit();
 		final SkillHolder[] skills = item.getItem().getSkills();
 		
 		if (skills == null)
@@ -79,7 +76,7 @@ public class BeastSpiritShot implements IItemHandler
 			return false;
 		}
 		
-		if (activePet.isChargedShot(isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS))
+		if (activeOwner.getSummon().isChargedShot(isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS))
 		{
 			// shots are already active.
 			return false;
@@ -96,9 +93,9 @@ public class BeastSpiritShot implements IItemHandler
 		
 		// Pet uses the power of spirit.
 		activeOwner.sendPacket(SystemMessageId.PET_USE_SPIRITSHOT);
-		activePet.setChargedShot(isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, true);
+		activeOwner.getSummon().setChargedShot(isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, true);
 		
-		Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activePet, activePet, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
+		Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(activeOwner.getSummon(), activeOwner.getSummon(), skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
 		return true;
 	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -153,9 +153,9 @@ public class ItemSkillsTemplate implements IItemHandler
 				{
 					playable.doSimultaneousCast(itemSkill);
 					// Summons should be affected by herbs too, self time effect is handled at L2Effect constructor
-					if (!playable.isSummon() && (activeChar.getPet() != null))
+					if (!playable.isSummon() && activeChar.hasSummon())
 					{
-						activeChar.getPet().doSimultaneousCast(itemSkill);
+						activeChar.getSummon().doSimultaneousCast(itemSkill);
 					}
 				}
 				else

L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java

@@ -12,12 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-
-/**
- *
- * @author FBIagent
- *
- */
 package handlers.itemhandlers;
 
 import java.util.logging.Level;
@@ -42,8 +36,10 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.PetItemList;
 import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
 import com.l2jserver.gameserver.util.Broadcast;
+
 /**
  * UnAfraid: TODO: Rewrite me :D
+ * @author FBIagent
  */
 public class SummonItems implements IItemHandler
 {
@@ -57,12 +53,15 @@ public class SummonItems implements IItemHandler
 		}
 		
 		if (!TvTEvent.onItemSummon(playable.getObjectId()))
+		{
 			return false;
+		}
 		
-		final L2PcInstance activeChar = (L2PcInstance) playable;
-		
+		final L2PcInstance activeChar = playable.getActingPlayer();
 		if (!activeChar.getFloodProtectors().getItemPetSummon().tryPerformAction("summon items"))
+		{
 			return false;
+		}
 		
 		if (activeChar.isSitting())
 		{
@@ -71,22 +70,28 @@ public class SummonItems implements IItemHandler
 		}
 		
 		if (activeChar.getBlockCheckerArena() != -1)
+		{
 			return false;
+		}
 		
 		if (activeChar.inObserverMode())
+		{
 			return false;
+		}
 		
 		if (activeChar.isInOlympiadMode())
 		{
 			activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
 			return false;
 		}
+		
 		if (activeChar.isAllSkillsDisabled() || activeChar.isCastingNow())
+		{
 			return false;
+		}
 		
 		final L2SummonItem sitem = SummonItemsData.getInstance().getSummonItem(item.getItemId());
-		
-		if ((activeChar.getPet() != null || activeChar.isMounted()) && sitem.isPetSummon())
+		if ((activeChar.hasSummon() || activeChar.isMounted()) && sitem.isPetSummon())
 		{
 			activeChar.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
 			return false;
@@ -100,11 +105,15 @@ public class SummonItems implements IItemHandler
 		
 		final int npcId = sitem.getNpcId();
 		if (npcId == 0)
+		{
 			return false;
+		}
 		
 		final L2NpcTemplate npcTemplate = NpcTable.getInstance().getTemplate(npcId);
 		if (npcTemplate == null)
+		{
 			return false;
+		}
 		
 		activeChar.stopMove(null, false);
 		
@@ -126,7 +135,9 @@ public class SummonItems implements IItemHandler
 						npc.setTitle(activeChar.getName());
 						npc.setIsRunning(false); // broadcast info
 						if (sitem.getDespawnDelay() > 0)
+						{
 							npc.scheduleDespawn(sitem.getDespawnDelay() * 1000L);
+						}
 					}
 				}
 				catch (Exception e)
@@ -155,7 +166,7 @@ public class SummonItems implements IItemHandler
 		return true;
 	}
 	
-	static class PetSummonFeedWait implements Runnable
+	private static class PetSummonFeedWait implements Runnable
 	{
 		private final L2PcInstance _activeChar;
 		private final L2PetInstance _petSummon;
@@ -172,9 +183,13 @@ public class SummonItems implements IItemHandler
 			try
 			{
 				if (_petSummon.getCurrentFed() <= 0)
+				{
 					_petSummon.unSummon(_activeChar);
+				}
 				else
+				{
 					_petSummon.startFeed();
+				}
 			}
 			catch (Exception e)
 			{
@@ -184,13 +199,13 @@ public class SummonItems implements IItemHandler
 	}
 	
 	// TODO: this should be inside skill handler
-	static class PetSummonFinalizer implements Runnable
+	private static class PetSummonFinalizer implements Runnable
 	{
 		private final L2PcInstance _activeChar;
 		private final L2ItemInstance _item;
 		private final L2NpcTemplate _npcTemplate;
 		
-		PetSummonFinalizer(L2PcInstance activeChar, L2NpcTemplate npcTemplate, L2ItemInstance item)
+		protected PetSummonFinalizer(L2PcInstance activeChar, L2NpcTemplate npcTemplate, L2ItemInstance item)
 		{
 			_activeChar = activeChar;
 			_npcTemplate = npcTemplate;
@@ -206,46 +221,55 @@ public class SummonItems implements IItemHandler
 				_activeChar.setIsCastingNow(false);
 				
 				// check for summon item validity
-				if (_item == null || _item.getOwnerId() != _activeChar.getObjectId() || _item.getLocation() != L2ItemInstance.ItemLocation.INVENTORY)
+				if ((_item == null) || (_item.getOwnerId() != _activeChar.getObjectId()) || (_item.getLocation() != L2ItemInstance.ItemLocation.INVENTORY))
+				{
 					return;
+				}
 				
-				final L2PetInstance petSummon = L2PetInstance.spawnPet(_npcTemplate, _activeChar, _item);
-				if (petSummon == null)
+				final L2PetInstance pet = L2PetInstance.spawnPet(_npcTemplate, _activeChar, _item);
+				if (pet == null)
+				{
 					return;
+				}
 				
-				petSummon.setShowSummonAnimation(true);
-				petSummon.setTitle(_activeChar.getName());
+				pet.setShowSummonAnimation(true);
+				pet.setTitle(_activeChar.getName());
 				
-				if (!petSummon.isRespawned())
+				if (!pet.isRespawned())
 				{
-					petSummon.setCurrentHp(petSummon.getMaxHp());
-					petSummon.setCurrentMp(petSummon.getMaxMp());
-					petSummon.getStat().setExp(petSummon.getExpForThisLevel());
-					petSummon.setCurrentFed(petSummon.getMaxFed());
+					pet.setCurrentHp(pet.getMaxHp());
+					pet.setCurrentMp(pet.getMaxMp());
+					pet.getStat().setExp(pet.getExpForThisLevel());
+					pet.setCurrentFed(pet.getMaxFed());
 				}
 				
-				petSummon.setRunning();
+				pet.setRunning();
 				
-				if (!petSummon.isRespawned())
-					petSummon.store();
+				if (!pet.isRespawned())
+				{
+					pet.store();
+				}
 				
-				_activeChar.setPet(petSummon);
+				_activeChar.setPet(pet);
 				
 				// JIV remove - done on spawn
-				// L2World.getInstance().storeObject(petSummon);
-				petSummon.spawnMe(_activeChar.getX() + 50, _activeChar.getY() + 100, _activeChar.getZ());
-				petSummon.startFeed();
-				_item.setEnchantLevel(petSummon.getLevel());
+				pet.spawnMe(_activeChar.getX() + 50, _activeChar.getY() + 100, _activeChar.getZ());
+				pet.startFeed();
+				_item.setEnchantLevel(pet.getLevel());
 				
-				if (petSummon.getCurrentFed() <= 0)
-					ThreadPoolManager.getInstance().scheduleGeneral(new PetSummonFeedWait(_activeChar, petSummon), 60000);
+				if (pet.getCurrentFed() <= 0)
+				{
+					ThreadPoolManager.getInstance().scheduleGeneral(new PetSummonFeedWait(_activeChar, pet), 60000);
+				}
 				else
-					petSummon.startFeed();
+				{
+					pet.startFeed();
+				}
 				
-				petSummon.setFollowStatus(true);
+				pet.setFollowStatus(true);
 				
-				petSummon.sendPacket(new PetItemList(petSummon));
-				petSummon.broadcastStatusUpdate();
+				pet.sendPacket(new PetItemList(pet.getInventory().getItems()));
+				pet.broadcastStatusUpdate();
 			}
 			catch (Exception e)
 			{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Continuous.java

@@ -153,11 +153,11 @@ public class Continuous implements ISkillHandler
 				else
 				{
 					L2Effect[] effects = skill.getEffects(activeChar, target, new Env(shld, ss, sps, bss));
-					L2Summon summon = target.getPet();
+					L2Summon summon = target.getSummon();
 					if (summon != null && summon != activeChar && summon.isServitor() && effects.length > 0)
 					{
 						if (effects[0].canBeStolen() || skill.isHeroSkill() || skill.isStatic())
-							skill.getEffects(activeChar, target.getPet(), new Env(shld, ss, sps, bss));
+							skill.getEffects(activeChar, target.getSummon(), new Env(shld, ss, sps, bss));
 					}
 				}
 				

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java

@@ -306,7 +306,7 @@ public class Disablers implements ISkillHandler
 					if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, ss, sps, bss) && !(target instanceof L2SiegeSummonInstance))
 					{
 						final L2PcInstance summonOwner = ((L2Summon) target).getOwner();
-						final L2Summon summon = summonOwner.getPet();
+						final L2Summon summon = summonOwner.getSummon();
 						if (summon != null)
 						{
 							// TODO: Retail confirmation for Soul of the Phoenix required.

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java

@@ -55,7 +55,7 @@ public class TargetAlly implements ITargetTypeHandler
 			final int radius = skill.getSkillRadius();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, false))
-				targetList.add(player.getPet());
+				targetList.add(player.getSummon());
 			
 			if (player.getClan() != null)
 			{
@@ -85,7 +85,7 @@ public class TargetAlly implements ITargetTypeHandler
 						continue;
 					
 					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
-						targetList.add(obj.getPet());
+						targetList.add(obj.getSummon());
 					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, false))
 						continue;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java

@@ -39,7 +39,7 @@ public class TargetAreaSummon implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		target = activeChar.getPet();
+		target = activeChar.getSummon();
 		if (target == null || !(target instanceof L2ServitorInstance) || target.isDead())
 			return _emptyTargetList;
 		

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java

@@ -60,7 +60,7 @@ public class TargetClan implements ITargetTypeHandler
 			final L2Clan clan = player.getClan();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, false))
-				targetList.add(player.getPet());
+				targetList.add(player.getSummon());
 			
 			if (clan != null)
 			{
@@ -88,7 +88,7 @@ public class TargetClan implements ITargetTypeHandler
 						continue;
 					
 					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
-						targetList.add(obj.getPet());
+						targetList.add(obj.getSummon());
 					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, false))
 						continue;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java

@@ -52,7 +52,7 @@ public class TargetCorpseAlly implements ITargetTypeHandler
 			final int radius = skill.getSkillRadius();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, true))
-				targetList.add(player.getPet());
+				targetList.add(player.getSummon());
 			
 			if (player.getClan() != null)
 			{
@@ -85,7 +85,7 @@ public class TargetCorpseAlly implements ITargetTypeHandler
 							continue;
 						
 						if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, true))
-							targetList.add(obj.getPet());
+							targetList.add(obj.getSummon());
 						
 						if (!L2Skill.addCharacter(activeChar, obj, radius, true))
 							continue;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java

@@ -57,7 +57,7 @@ public class TargetCorpseClan implements ITargetTypeHandler
 			final L2Clan clan = player.getClan();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, true))
-				targetList.add(player.getPet());
+				targetList.add(player.getSummon());
 			
 			if (clan != null)
 			{
@@ -85,7 +85,7 @@ public class TargetCorpseClan implements ITargetTypeHandler
 						continue;
 					
 					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, true))
-						targetList.add(obj.getPet());
+						targetList.add(obj.getSummon());
 					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, true))
 						continue;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java

@@ -31,7 +31,7 @@ public class TargetCorpsePet implements ITargetTypeHandler
 	{
 		if (activeChar instanceof L2PcInstance)
 		{
-			target = activeChar.getPet();
+			target = activeChar.getSummon();
 			if (target != null && target.isDead())
 				return new L2Character[] { target };
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java

@@ -34,7 +34,7 @@ public class TargetEnemySummon implements ITargetTypeHandler
 		if(target instanceof L2Summon)
 		{
 			L2Summon targetSummon = (L2Summon)target;
-			if (activeChar instanceof L2PcInstance && activeChar.getPet() != targetSummon && !targetSummon.isDead()
+			if (activeChar instanceof L2PcInstance && activeChar.getSummon() != targetSummon && !targetSummon.isDead()
 					&& (targetSummon.getOwner().getPvpFlag() != 0 || targetSummon.getOwner().getKarma() > 0)
 					|| (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && ((L2PcInstance)activeChar).isInsideZone(ZoneId.PVP))
 					|| (targetSummon.getOwner().isInDuel() && ((L2PcInstance)activeChar).isInDuel() && targetSummon.getOwner().getDuelId() == ((L2PcInstance)activeChar).getDuelId()))

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java

@@ -51,7 +51,7 @@ public class TargetParty implements ITargetTypeHandler
 		else if (activeChar instanceof L2PcInstance)
 		{
 			if (L2Skill.addSummon(activeChar, player, radius, false))
-				targetList.add(player.getPet());
+				targetList.add(player.getSummon());
 		}
 		
 		if (activeChar.isInParty())
@@ -69,7 +69,7 @@ public class TargetParty implements ITargetTypeHandler
 					targetList.add(partyMember);
 				
 				if (L2Skill.addSummon(activeChar, partyMember, radius, false))
-					targetList.add(partyMember.getPet());
+					targetList.add(partyMember.getSummon());
 			}
 		}
 		return targetList.toArray(new L2Character[targetList.size()]);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java

@@ -51,7 +51,7 @@ public class TargetPartyClan implements ITargetTypeHandler
 		final boolean hasParty = player.isInParty();
 		
 		if (L2Skill.addSummon(activeChar, player, radius, false))
-			targetList.add(player.getPet());
+			targetList.add(player.getSummon());
 		
 		// if player in clan and not in party
 		if (!(hasClan || hasParty))
@@ -96,7 +96,7 @@ public class TargetPartyClan implements ITargetTypeHandler
 				continue;
 			
 			if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
-				targetList.add(obj.getPet());
+				targetList.add(obj.getSummon());
 			
 			if (!L2Skill.addCharacter(activeChar, obj, radius, false))
 				continue;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java

@@ -38,8 +38,8 @@ public class TargetPartyMember implements ITargetTypeHandler
 		{
 			if ((target == activeChar) ||
 				(activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId())) ||
-				(activeChar.isPlayer() && target.isSummon() && (activeChar.getPet() == target)) ||
-				(activeChar.isSummon() && target.isPlayer() && (activeChar == target.getPet())))
+				(activeChar.isPlayer() && target.isSummon() && (activeChar.getSummon() == target)) ||
+				(activeChar.isSummon() && target.isPlayer() && (activeChar == target.getSummon())))
 			{
 				return new L2Character[] { target };
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java

@@ -49,8 +49,8 @@ public class TargetPartyNotMe implements ITargetTypeHandler
 		else if (activeChar instanceof L2PcInstance)
 		{
 			player = (L2PcInstance) activeChar;
-			if (activeChar.getPet() != null)
-				targetList.add(activeChar.getPet());
+			if (activeChar.getSummon() != null)
+				targetList.add(activeChar.getSummon());
 		}
 		
 		if (activeChar.getParty() != null)
@@ -70,9 +70,9 @@ public class TargetPartyNotMe implements ITargetTypeHandler
 					
 					targetList.add(partyMember);
 					
-					if (partyMember.getPet() != null && !partyMember.getPet().isDead())
+					if (partyMember.getSummon() != null && !partyMember.getSummon().isDead())
 					{
-						targetList.add(partyMember.getPet());
+						targetList.add(partyMember.getSummon());
 					}
 				}
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java

@@ -28,7 +28,7 @@ public class TargetPet implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		target = activeChar.getPet();
+		target = activeChar.getSummon();
 		if (target != null && !target.isDead())
 			return new L2Character[] { target };
 		

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java

@@ -17,7 +17,6 @@ package handlers.targethandlers;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
@@ -29,8 +28,8 @@ public class TargetSummon implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		target = activeChar.getPet();
-		if (target != null && !target.isDead() && target instanceof L2ServitorInstance)
+		target = activeChar.getSummon();
+		if (target != null && !target.isDead() && target.isServitor())
 			return new L2Character[] { target };
 		
 		return _emptyTargetList;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Mount.java

@@ -34,7 +34,7 @@ public class Mount implements IUserCommandHandler
 		if (id != COMMAND_IDS[0])
 			return false;
 		
-		return activeChar.mountPlayer(activeChar.getPet());
+		return activeChar.mountPlayer(activeChar.getSummon());
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java

@@ -592,7 +592,7 @@ public class CrystalCaverns extends Quest
 		player.breakAttack();
 		player.breakCast();
 		player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
-		L2Summon pet = player.getPet();
+		L2Summon pet = player.getSummon();
 		if (pet != null)
 		{
 			pet.setTarget(null);
@@ -1100,8 +1100,8 @@ public class CrystalCaverns extends Quest
 				{
 					p.setIsParalyzed(false);
 					Throw(npc, p);
-					if (p.getPet() != null)
-						Throw(npc, p.getPet());
+					if (p.getSummon() != null)
+						Throw(npc, p.getSummon());
 				}
 				world._raidStatus = 0;
 				for (L2Npc mob : world._animationMobs)
@@ -1701,7 +1701,7 @@ public class CrystalCaverns extends Quest
 					int x = (int) (radius * Math.cos(i * 2 * Math.PI / members));
 					int y = (int) (radius * Math.sin(i++ * 2 * Math.PI / members));
 					p.teleToLocation(153571 + x, 142075 + y, -12737);
-					L2Summon pet = p.getPet();
+					L2Summon pet = p.getSummon();
 					if (pet != null)
 					{
 						pet.teleToLocation(153571 + x, 142075 + y, -12737, true);

L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java

@@ -930,9 +930,9 @@ public class FinalEmperialTomb extends Quest
 									{
 										targetList.add(player);
 									}
-									if ((player.getPet() != null) && !player.getPet().isDead())
+									if (player.hasSummon() && !player.getSummon().isDead())
 									{
-										targetList.add(player.getPet());
+										targetList.add(player.getSummon());
 									}
 								}
 							}

L2J_DataPack_BETA/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java

@@ -522,9 +522,9 @@ public class Kamaloka extends Quest
 				continue;
 			e.exit();
 		}
-		if (ch.getPet() != null)
+		if (ch.getSummon() != null)
 		{
-			for (L2Effect e : ch.getPet().getAllEffects())
+			for (L2Effect e : ch.getSummon().getAllEffects())
 			{
 				if (e == null)
 					continue;

L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java

@@ -250,10 +250,10 @@ public class NornilsGarden extends Quest
 		}
 		removeBuffs(player);
 		giveBuffs(player);
-		if (player.getPet() != null)
+		if (player.hasSummon())
 		{
-			removeBuffs(player.getPet());
-			giveBuffs(player.getPet());
+			removeBuffs(player.getSummon());
+			giveBuffs(player.getSummon());
 		}
 		player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 		player.setInstanceId(instanceId);

L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java

@@ -431,7 +431,7 @@ public class PailakaDevilsLegacy extends Quest
 				}
 				return "32501-01.htm";
 			case ADVENTURER1:
-				if (player.getPet() == null)
+				if (!player.hasSummon())
 				{
 					if (st.hasQuestItems(SWORD))
 					{
@@ -466,7 +466,7 @@ public class PailakaDevilsLegacy extends Quest
 				}
 				return "32508-07.htm";
 			case ADVENTURER2:
-				if (player.getPet() == null)
+				if (!player.hasSummon())
 				{
 					st.unset("cond");
 					st.playSound("ItemSound.quest_finish");
@@ -515,7 +515,7 @@ public class PailakaDevilsLegacy extends Quest
 						{
 							if (isPet)
 							{
-								attackPlayer((L2Attackable) npc, attacker.getPet());
+								attackPlayer((L2Attackable) npc, attacker.getSummon());
 							}
 							else
 							{

L2J_DataPack_BETA/dist/game/data/scripts/instances/SecretArea/SecretArea.java

@@ -55,11 +55,11 @@ public class SecretArea extends Quest
 		player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 		player.setInstanceId(instanceId);
 		player.teleToLocation(loc, false);
-		if (player.getPet() != null)
+		if (player.hasSummon())
 		{
-			player.getPet().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
-			player.getPet().setInstanceId(instanceId);
-			player.getPet().teleToLocation(loc, false);
+			player.getSummon().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+			player.getSummon().setInstanceId(instanceId);
+			player.getSummon().teleToLocation(loc, false);
 		}
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py

@@ -112,7 +112,7 @@ class Quest (JQuest) :
       JQuest.__init__(self,id,name,descr)
       self.questItemIds = range(3337,3390)
       # list to hold the player and pet instance of the player in the duel and an "isFoul" flag, indexed by npcId 
-      self.inProgressDuelMobs = {} # [player, player.getPet(), True/False]
+      self.inProgressDuelMobs = {} # [player, player.getSummon(), True/False]
 
    def onAdvEvent (self,event,npc, player) :
       htmltext = event
@@ -288,7 +288,7 @@ class Quest (JQuest) :
    def onDeath(self,killer,deadPerson,st) :               # if players summon dies, the crystal of defeat is given to the player and set stat to lose
       if not isinstance(killer, L2Attackable): return
       npcId = killer.getNpcId()
-##      if (deadPerson == st.getPlayer() or deadPerson = st.getPlayer().getPet()) and npcId in DROPLIST_SUMMON.keys() :
+##      if (deadPerson == st.getPlayer() or deadPerson = st.getPlayer().getSummon()) and npcId in DROPLIST_SUMMON.keys() :
       if npcId in DROPLIST_SUMMON.keys() :
          st.getPlayer().removeNotifyQuestOfDeath(st)
          # var means the variable of the SummonerManager, the rest are all Crystalls wich mark the status
@@ -312,12 +312,12 @@ class Quest (JQuest) :
             # if not, mark this as a foul.
             if not isPet :
                self.inProgressDuelMobs[npcId][2] = True
-            elif player.getPet() != self.inProgressDuelMobs[npcId][1] :
+            elif player.getSummon() != self.inProgressDuelMobs[npcId][1] :
                self.inProgressDuelMobs[npcId][2] = True
          # if the npc had never before been attacked, check if it's time to mark a duel in progress
          elif not st : return
          elif st.getState() != State.STARTED : return
-         elif not isPet and st.getInt(var) == 2: self.inProgressDuelMobs[npcId] = [player, player.getPet(), True] # foul
+         elif not isPet and st.getInt(var) == 2: self.inProgressDuelMobs[npcId] = [player, player.getSummon(), True] # foul
          else :
             # var means the variable of the SummonerManager, the rest are all Crystalls which mark the status
             if st.getInt(var) == 2:
@@ -325,7 +325,7 @@ class Quest (JQuest) :
                st.giveItems(progress,1)
                st.takeItems(start,1)
                st.playSound("ItemSound.quest_itemget")
-               self.inProgressDuelMobs[npcId] = [player, player.getPet(), False] #mark the attack
+               self.inProgressDuelMobs[npcId] = [player, player.getSummon(), False] #mark the attack
       return
 
    def onKill(self,npc,player,isPet):
@@ -351,7 +351,7 @@ class Quest (JQuest) :
          # If the attacker is the pet of a player who is doing the quest, mark it as a valid hit.
          if not self.inProgressDuelMobs.has_key(npcId) and isPet and st :
             if st.getInt(var) == 2:
-               self.inProgressDuelMobs[npcId] = [player, player.getPet(), False]
+               self.inProgressDuelMobs[npcId] = [player, player.getSummon(), False]
 
          # if the killed mob is now in the progress list, there is work to be done...
          if self.inProgressDuelMobs.has_key(npcId) :
@@ -359,7 +359,7 @@ class Quest (JQuest) :
             # if not, mark this as a foul.
             if not isPet :
                self.inProgressDuelMobs[npcId][2] = True
-            elif player.getPet() != self.inProgressDuelMobs[npcId][1] :
+            elif player.getSummon() != self.inProgressDuelMobs[npcId][1] :
                self.inProgressDuelMobs[npcId][2] = True
 
             # if a foul has NOT occured, give the player the victory crystal

L2J_DataPack_BETA/dist/game/data/scripts/quests/421_LittleWingAdventures/__init__.py

@@ -96,14 +96,14 @@ class Quest (JQuest) :
          st.exitQuest(1)
          htmltext = "30610-06.htm"
    elif event == "30747-02.htm" :
-      summon = player.getPet()
+      summon = player.getSummon()
       if summon :
          if summon.getControlItem().getObjectId() == st.getInt("summonOid"):
             htmltext = "30747-04.htm"
          else :
             htmltext = "30747-03.htm"
    elif event == "30747-05.htm" :
-      summon = player.getPet()
+      summon = player.getSummon()
       if summon :
          if summon.getControlItem().getObjectId() == st.getInt("summonOid"):
             htmltext = "30747-05.htm"
@@ -159,7 +159,7 @@ class Quest (JQuest) :
             st.set("id","2")
             htmltext = "30747-01.htm"
          elif st.getInt("id") == 2 :
-            summon = player.getPet()
+            summon = player.getSummon()
             if summon :
                if summon.getControlItem().getObjectId() == st.getInt("summonOid"):
                   htmltext = "30747-04.htm"
@@ -172,7 +172,7 @@ class Quest (JQuest) :
          elif st.getInt("id") > 0 and st.getInt("id") < 15 and st.getQuestItemsCount(FT_LEAF) >= 1 :
             htmltext = "30747-11.htm"
          elif st.getInt("id") == 15 and st.getQuestItemsCount(FT_LEAF) == 0 :
-            summon = player.getPet()
+            summon = player.getSummon()
             if summon :
                if summon.getControlItem().getObjectId() == st.getInt("summonOid"):
                   st.set("id","16")
@@ -182,7 +182,7 @@ class Quest (JQuest) :
             else :
                htmltext = "30747-12.htm"
          elif st.getInt("id") == 16:
-            summon = player.getPet()
+            summon = player.getSummon()
             if summon :
                htmltext = "30747-15.htm"
             elif (st.getQuestItemsCount(3500) + st.getQuestItemsCount(3501) + st.getQuestItemsCount(3502)) == 1 :
@@ -247,7 +247,7 @@ class Quest (JQuest) :
       if pc == player and mobId == npcId:
          return
    if isPet and st.getInt("id") < 16:
-      pet = player.getPet()
+      pet = player.getSummon()
       if self.getRandom(100) <= 2 and st.getQuestItemsCount(FT_LEAF) >= 0:
          st.takeItems(FT_LEAF,1)
          st.playSound("ItemSound.quest_middle")

L2J_DataPack_BETA/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py

@@ -29,7 +29,7 @@ TYRANT_KINGPIN = 20193
 TRISALIM_TARANTULA = 20561
 
 def findPetLvl (player, itemid) :
-    pet = player.getPet()
+    pet = player.getSummon()
     if pet:
         if pet.getNpcId() == 12564 :
             level = pet.getStat().getLevel()
@@ -85,7 +85,7 @@ class Quest (JQuest) :
         plevel = findPetLvl(player,PENITENTS_MANACLES)
         level = player.getLevel()
         olevel = st.getInt("level")
-        pet = player.getPet()
+        pet = player.getSummon()
         if pet:
             if pet.getNpcId() == 12564 :
                 htmltext = "30981-16.htm"

L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java

@@ -386,7 +386,7 @@ public final class Q00511_AwlUnderFoot extends Quest
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isPet)
 	{
-		L2Playable attacker = (isPet ? player.getPet() : player);
+		L2Playable attacker = (isPet ? player.getSummon() : player);
 		if ((attacker.getLevel() - npc.getLevel()) >= 9)
 		{
 			if ((attacker.getBuffCount() > 0) || (attacker.getDanceCount() > 0))

L2J_DataPack_BETA/dist/game/data/scripts/transformations/DemonRace.java

@@ -42,9 +42,9 @@ public class DemonRace extends L2Transformation
 			return;
 		}
 		
-		if (getPlayer().getPet() != null)
+		if (getPlayer().hasSummon())
 		{
-			getPlayer().getPet().unSummon(getPlayer());
+			getPlayer().getSummon().unSummon(getPlayer());
 		}
 		
 		transformedSkills();

L2J_DataPack_BETA/dist/game/data/scripts/transformations/DivineSummoner.java

@@ -39,9 +39,9 @@ public class DivineSummoner extends L2Transformation
 			return;
 		}
 		
-		if (getPlayer().getPet() != null)
+		if (getPlayer().hasSummon())
 		{
-			getPlayer().getPet().unSummon(getPlayer());
+			getPlayer().getSummon().unSummon(getPlayer());
 		}
 		
 		transformedSkills();
@@ -70,9 +70,9 @@ public class DivineSummoner extends L2Transformation
 	@Override
 	public void onUntransform()
 	{
-		if (getPlayer().getPet() != null)
+		if (getPlayer().hasSummon())
 		{
-			getPlayer().getPet().unSummon(getPlayer());
+			getPlayer().getSummon().unSummon(getPlayer());
 		}
 		
 		removeSkills();

L2J_DataPack_BETA/dist/game/data/scripts/transformations/MyoRace.java

@@ -42,9 +42,9 @@ public class MyoRace extends L2Transformation
 			return;
 		}
 		
-		if (getPlayer().getPet() != null)
+		if (getPlayer().hasSummon())
 		{
-			getPlayer().getPet().unSummon(getPlayer());
+			getPlayer().getSummon().unSummon(getPlayer());
 		}
 		
 		transformedSkills();

L2J_DataPack_BETA/dist/game/data/scripts/transformations/Unicorniun.java

@@ -42,9 +42,9 @@ public class Unicorniun extends L2Transformation
 			return;
 		}
 		
-		if (getPlayer().getPet() != null)
+		if (getPlayer().hasSummon())
 		{
-			getPlayer().getPet().unSummon(getPlayer());
+			getPlayer().getSummon().unSummon(getPlayer());
 		}
 		
 		transformedSkills();

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipController.java

@@ -201,7 +201,7 @@ public abstract class AirShipController extends Quest
 				player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_HOLDING_A_FLAG);
 				return null;
 			}
-			else if ((player.getPet() != null) || player.isMounted())
+			else if (player.hasSummon() || player.isMounted())
 			{
 				player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 				return null;

L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -158,7 +158,7 @@ public class AirShipGludioGracia extends Quest implements Runnable
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_HOLDING_A_FLAG);
 			return null;
 		}
-		else if (player.getPet() != null || player.isMounted())
+		else if (player.hasSummon() || player.isMounted())
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
 			return null;