From 1b0b9c308b3d36dc7b67fe489837fb75be2416ec Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 1 Sep 2020 22:27:25 +0000
Subject: [PATCH] Fixed Porta (20213) callSkill failed warning.

---
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 .../handlers/effecthandlers/CallPc.java       | 44 ++++++++++++-------
 17 files changed, 459 insertions(+), 289 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index defb1b3b84..0d066a5319 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index 7cf57eff35..2b349d09cb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -20,6 +20,7 @@ import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.SevenSigns;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.conditions.Condition;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -66,30 +67,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = info.getEffected().getActingPlayer();
 		final PlayerInstance player = info.getEffector().getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(info.getEffector());
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index 18d1423e25..9b3bc18be4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -20,6 +20,7 @@ import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.SevenSigns;
 import org.l2jmobius.gameserver.instancemanager.InstanceManager;
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.conditions.Condition;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -66,30 +67,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = info.getEffected().getActingPlayer();
 		final PlayerInstance player = info.getEffector().getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(info.getEffector());
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index a625e8f825..ceeb43cdb2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
index aee915c451..8842868786 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java
@@ -17,6 +17,7 @@
 package handlers.effecthandlers;
 
 import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -61,30 +62,39 @@ public class CallPc extends AbstractEffect
 		
 		final PlayerInstance target = effected.getActingPlayer();
 		final PlayerInstance player = effector.getActingPlayer();
-		if (checkSummonTargetStatus(target, player))
+		if (player != null)
 		{
-			if ((_itemId != 0) && (_itemCount != 0))
+			if (checkSummonTargetStatus(target, player))
 			{
-				if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+				if ((_itemId != 0) && (_itemCount != 0))
 				{
-					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+					if (target.getInventory().getInventoryItemCount(_itemId, 0) < _itemCount)
+					{
+						final SystemMessage sm = new SystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(_itemId);
+						target.sendPacket(sm);
+						return;
+					}
+					target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
+					final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
 					sm.addItemName(_itemId);
 					target.sendPacket(sm);
-					return;
 				}
-				target.getInventory().destroyItemByItemId("Consume", _itemId, _itemCount, player, target);
-				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(_itemId);
-				target.sendPacket(sm);
+				target.addScript(new SummonRequestHolder(player));
+				
+				final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
+				confirm.getSystemMessage().addString(player.getName());
+				confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
+				confirm.addTime(30000);
+				confirm.addRequesterId(player.getObjectId());
+				target.sendPacket(confirm);
 			}
-			target.addScript(new SummonRequestHolder(player));
-			
-			final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
-			confirm.getSystemMessage().addString(player.getName());
-			confirm.getSystemMessage().addZoneName(player.getX(), player.getY(), player.getZ());
-			confirm.addTime(30000);
-			confirm.addRequesterId(player.getObjectId());
-			target.sendPacket(confirm);
+		}
+		else if (target != null)
+		{
+			final WorldObject previousTarget = target.getTarget();
+			target.teleToLocation(effector);
+			target.setTarget(previousTarget);
 		}
 	}