Unsummon previous existing pet, return null if template does not exist.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -180,9 +180,10 @@ public class PetInstance extends Summon
 	 */
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
 		
 		final PetInstance pet = restore(control, template, owner);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -181,9 +181,10 @@ public class PetInstance extends Summon
 	 */
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
 		
 		final PetInstance pet = restore(control, template, owner);

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -231,10 +231,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -231,10 +231,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -217,10 +217,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -216,10 +216,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetData data = PetDataTable.getInstance().getPetData(template.getId());
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -327,10 +327,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world
 		if (pet != null)

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -327,10 +327,12 @@ public class PetInstance extends Summon
 	
 	public static synchronized PetInstance spawnPet(NpcTemplate template, PlayerInstance owner, ItemInstance control)
 	{
-		if (World.getInstance().getPet(owner.getObjectId()) != null)
+		final PetInstance existingPet = World.getInstance().getPet(owner.getObjectId());
+		if (existingPet != null) // owner has a pet listed in world
 		{
-			return null; // owner has a pet listed in world
+			existingPet.unSummon(owner);
 		}
+		
 		final PetInstance pet = restore(control, template, owner);
 		// add the pet instance to world
 		if (pet != null)