Proper summon request holder.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());
@@ -148,7 +148,7 @@ public class CallPc extends AbstractEffect
 		}
 		
 		final Instance instance = effector.getInstanceWorld();
-		if ((instance != null) && !instance.isPlayerSummonAllowed())
+		if (((instance != null) && !instance.isPlayerSummonAllowed()) || effector.isInTimedHuntingZone())
 		{
 			effector.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION);
 			return false;

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java

@@ -239,7 +239,7 @@ public class SummonFriend implements ISkillHandler
 						}
 						else
 						{
-							PlayerInstance.teleToTarget(targetChar, (PlayerInstance) creature, skill);
+							PlayerInstance.teleToTarget(targetChar, (PlayerInstance) creature, creature.getLocation(), skill);
 							targetChar.teleportRequest(null, null);
 						}
 					}

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

@@ -768,41 +768,29 @@ public class PlayerInstance extends Playable
 		return savedStatus;
 	}
 	
-	/**
-	 * The Class SummonRequest.
-	 */
 	protected static class SummonRequest
 	{
-		/** The _target. */
+		private PlayerInstance _summoner;
-		private PlayerInstance _target = null;
+		private Location _location;
+		private Skill _skill;
 		
-		/** The _skill. */
+		public void setTarget(PlayerInstance summoner, Skill skill)
-		private Skill _skill = null;
-		
-		/**
-		 * Sets the target.
-		 * @param destination the destination
-		 * @param skill the skill
-		 */
-		public void setTarget(PlayerInstance destination, Skill skill)
 		{
-			_target = destination;
+			_summoner = summoner;
+			_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 			_skill = skill;
 		}
 		
-		/**
+		public PlayerInstance getSummoner()
-		 * Gets the target.
-		 * @return the target
-		 */
-		public PlayerInstance getTarget()
 		{
-			return _target;
+			return _summoner;
+		}
+		
+		public Location getLocation()
+		{
+			return _location;
 		}
 		
-		/**
-		 * Gets the skill.
-		 * @return the skill
-		 */
 		public Skill getSkill()
 		{
 			return _skill;
@@ -13332,14 +13320,14 @@ public class PlayerInstance extends Playable
 	}
 	
 	/**
-	 * Request Teleport *.
+	 * Request Teleport action.
 	 * @param requester the requester
 	 * @param skill the skill
 	 * @return true, if successful
 	 */
 	public boolean teleportRequest(PlayerInstance requester, Skill skill)
 	{
-		if ((_summonRequest.getTarget() != null) && (requester != null))
+		if ((_summonRequest.getSummoner() != null) && (requester != null))
 		{
 			return false;
 		}
@@ -13348,41 +13336,43 @@ public class PlayerInstance extends Playable
 	}
 	
 	/**
-	 * Action teleport *.
+	 * Action teleport answer.
 	 * @param answer the answer
 	 * @param requesterId the requester id
 	 */
 	public void teleportAnswer(int answer, int requesterId)
 	{
-		if (_summonRequest.getTarget() == null)
+		if (_summonRequest.getSummoner() == null)
 		{
 			return;
 		}
-		if ((answer == 1) && (_summonRequest.getTarget().getObjectId() == requesterId))
+		if ((answer == 1) && (_summonRequest.getSummoner().getObjectId() == requesterId))
 		{
-			teleToTarget(this, _summonRequest.getTarget(), _summonRequest.getSkill());
+			teleToTarget(this, _summonRequest.getSummoner(), _summonRequest.getLocation(), _summonRequest.getSkill());
 		}
 		_summonRequest.setTarget(null, null);
 	}
 	
 	/**
 	 * Tele to target.
-	 * @param targetChar the target char
+	 * @param player the target player
-	 * @param summonerChar the summoner char
+	 * @param summoner the summoner player
+	 * @param location the summon location
 	 * @param summonSkill the summon skill
 	 */
-	public static void teleToTarget(PlayerInstance targetChar, PlayerInstance summonerChar, Skill summonSkill)
+	public static void teleToTarget(PlayerInstance player, PlayerInstance summoner, Location location, Skill summonSkill)
 	{
-		if ((targetChar == null) || (summonerChar == null) || (summonSkill == null))
+		if ((player == null) || (summoner == null) || (summonSkill == null))
 		{
 			return;
 		}
 		
-		if (!checkSummonerStatus(summonerChar))
+		if (!checkSummonerStatus(summoner))
 		{
 			return;
 		}
-		if (!checkSummonTargetStatus(targetChar, summonerChar))
+		
+		if (!checkSummonTargetStatus(player, summoner))
 		{
 			return;
 		}
@@ -13391,19 +13381,20 @@ public class PlayerInstance extends Playable
 		final int itemConsumeCount = summonSkill.getTargetConsume();
 		if ((itemConsumeId != 0) && (itemConsumeCount != 0))
 		{
-			if (targetChar.getInventory().getInventoryItemCount(itemConsumeId, 0) < itemConsumeCount)
+			if (player.getInventory().getInventoryItemCount(itemConsumeId, 0) < itemConsumeCount)
 			{
 				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_REQUIRED_FOR_SUMMONING);
 				sm.addItemName(summonSkill.getTargetConsumeId());
-				targetChar.sendPacket(sm);
+				player.sendPacket(sm);
 				return;
 			}
-			targetChar.getInventory().destroyItemByItemId("Consume", itemConsumeId, itemConsumeCount, summonerChar, targetChar);
+			player.getInventory().destroyItemByItemId("Consume", itemConsumeId, itemConsumeCount, summoner, player);
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
 			sm.addItemName(summonSkill.getTargetConsumeId());
-			targetChar.sendPacket(sm);
+			player.sendPacket(sm);
 		}
-		targetChar.teleToLocation(summonerChar.getX(), summonerChar.getY(), summonerChar.getZ(), true);
+		
+		player.teleToLocation(location, true);
 	}
 	
 	/**

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -82,8 +82,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, info.getSkill()));
 			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());

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -91,9 +91,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -82,8 +82,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, info.getSkill()));
 			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());

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -91,9 +91,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java

@@ -77,8 +77,8 @@ public class CallPc extends AbstractEffect
 				sm.addItemName(_itemId);
 				target.sendPacket(sm);
 			}
+			target.addScript(new SummonRequestHolder(player));
 			
-			target.addScript(new SummonRequestHolder(player, skill));
 			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());

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java

@@ -117,7 +117,7 @@ public class TeleportToPlayer extends AbstractEffect
 				return;
 			}
 			
-			effector.teleToLocation(effector.getTarget(), true, null);
+			effector.teleToLocation(target, true, null);
 		}
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SummonRequestHolder.java

@@ -16,30 +16,30 @@
  */
 package org.l2jmobius.gameserver.model.holders;
 
+import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.skills.Skill;
 
 /**
- * @author UnAfraid
+ * @author Mobius
  */
 public class SummonRequestHolder
 {
-	private final PlayerInstance _target;
+	private final PlayerInstance _summoner;
-	private final Skill _skill;
+	private final Location _location;
 	
-	public SummonRequestHolder(PlayerInstance destination, Skill skill)
+	public SummonRequestHolder(PlayerInstance summoner)
 	{
-		_target = destination;
+		_summoner = summoner;
-		_skill = skill;
+		_location = new Location(summoner.getX(), summoner.getY(), summoner.getZ(), summoner.getHeading());
 	}
 	
-	public PlayerInstance getTarget()
+	public PlayerInstance getSummoner()
 	{
-		return _target;
+		return _summoner;
 	}
 	
-	public Skill getSkill()
+	public Location getLocation()
 	{
-		return _skill;
+		return _location;
 	}
 }

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java

@@ -83,9 +83,9 @@ public class DlgAnswer implements IClientIncomingPacket
 		else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId())
 		{
 			final SummonRequestHolder holder = player.removeScript(SummonRequestHolder.class);
-			if ((_answer == 1) && (holder != null) && (holder.getTarget().getObjectId() == _requesterId))
+			if ((_answer == 1) && (holder != null) && (holder.getSummoner().getObjectId() == _requesterId))
 			{
-				player.teleToLocation(holder.getTarget().getLocation(), true);
+				player.teleToLocation(holder.getLocation(), true);
 			}
 		}
 		else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId())