Teleport summons with player revive.

2020-09-14 09:37:19 +00:00
parent 1469df4779
commit a0c5478aaf
19 changed files with 321 additions and 0 deletions
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -10042,10 +10042,29 @@ public class PlayerInstance extends Playable
 	public void doRevive()
 	{
 		super.doRevive();
+		
 		sendPacket(new EtcStatusUpdate(this));
 		_revivePet = false;
 		_reviveRequested = 0;
 		_revivePower = 0;
+		
+		// Teleport summons to player.
+		if (isInsideZone(ZoneId.PEACE) && hasSummon())
+		{
+			final PetInstance pet = getPet();
+			if (pet != null)
+			{
+				pet.teleToLocation(this, true);
+			}
+			for (Summon summon : getServitors().values())
+			{
+				if (!summon.isInsideZone(ZoneId.SIEGE))
+				{
+					summon.teleToLocation(this, true);
+				}
+			}
+		}
+		
 		if (isMounted())
 		{
 			startFeed(_mountNpcId);