lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Teleport summons with player revive.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-09-14 09:37:19 +00:00
parent 1469df4779
commit a0c5478aaf
19 changed files with 321 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10089,10 +10089,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);
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10096,10 +10096,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);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10098,10 +10098,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);
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10089,10 +10089,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);
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10076,10 +10076,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);
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10076,10 +10076,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);
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10082,10 +10082,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);
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10097,10 +10097,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);
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8
View File
@@ -12437,9 +12437,17 @@ public class PlayerInstance extends Playable
public void doRevive()
{
super.doRevive();
updateEffectIcons();
_reviveRequested = 0;
_revivePower = 0;
// Teleport summon to player.
if (isInsideZone(ZoneId.PEACE) && (_summon != null) && !_summon.isInsideZone(ZoneId.SIEGE))
{
_summon.teleToLocation(getLocation(), true);
}
if (isInParty() && getParty().isInDimensionalRift() && !DimensionalRiftManager.getInstance().checkIfInPeaceZone(getX(), getY(), getZ()))
{
getParty().getDimensionalRift().memberRessurected(this);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+8
View File
@@ -12746,10 +12746,18 @@ public class PlayerInstance extends Playable
public void doRevive()
{
super.doRevive();
updateEffectIcons();
sendPacket(new EtcStatusUpdate(this));
_reviveRequested = 0;
_revivePower = 0;
// Teleport summon to player.
if (isInsideZone(ZoneId.PEACE) && (_summon != null) && !_summon.isInsideZone(ZoneId.SIEGE))
{
_summon.teleToLocation(getLocation(), true);
}
if (isInParty() && getParty().isInDimensionalRift() && !DimensionalRiftManager.getInstance().checkIfInPeaceZone(getX(), getY(), getZ()))
{
getParty().getDimensionalRift().memberRessurected(this);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+10
View File
@@ -10627,19 +10627,29 @@ public class PlayerInstance extends Playable
public void doRevive()
{
super.doRevive();
updateEffectIcons();
sendPacket(new EtcStatusUpdate(this));
_revivePet = false;
_reviveRequested = 0;
_revivePower = 0;
// Teleport summon to player.
if (isInsideZone(ZoneId.PEACE) && (_summon != null) && !_summon.isInsideZone(ZoneId.SIEGE))
{
_summon.teleToLocation(getLocation(), true);
}
if (isMounted())
{
startFeed(_mountNpcId);
}
if (isInParty() && _party.isInDimensionalRift() && !DimensionalRiftManager.getInstance().checkIfInPeaceZone(getX(), getY(), getZ()))
{
_party.getDimensionalRift().memberRessurected(this);
}
if (getInstanceId() > 0)
{
final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+10
View File
@@ -10510,19 +10510,29 @@ public class PlayerInstance extends Playable
public void doRevive()
{
super.doRevive();
updateEffectIcons();
sendPacket(new EtcStatusUpdate(this));
_revivePet = false;
_reviveRequested = 0;
_revivePower = 0;
// Teleport summon to player.
if (isInsideZone(ZoneId.PEACE) && (_summon != null) && !_summon.isInsideZone(ZoneId.SIEGE))
{
_summon.teleToLocation(getLocation(), true);
}
if (isMounted())
{
startFeed(_mountNpcId);
}
if (isInParty() && _party.isInDimensionalRift() && !DimensionalRiftManager.getInstance().checkIfInPeaceZone(getX(), getY(), getZ()))
{
_party.getDimensionalRift().memberRessurected(this);
}
if (getInstanceId() > 0)
{
final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10030,10 +10030,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);
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10030,10 +10030,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);
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10016,10 +10016,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);
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10043,10 +10043,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);
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -10043,10 +10043,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);
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -9989,10 +9989,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);
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+19
View File
@@ -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);