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

Reverted session zone Die packet escape block.

Browse Source 
Contributed by Enryu.
This commit is contained in:
MobiusDevelopment
2022-12-14 22:04:03 +00:00
parent 527e1b3f64
commit b20800bf21
8 changed files with 278 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -44,19 +43,7 @@ public class Die extends ServerPacket
_isSweepable = creature.isAttackable() && creature.isSweepActive();
if (creature.isPlayer())
{
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
final Player player = creature.getActingPlayer();
if (!player.isInTimedHuntingZone())
{
final Clan clan = player.getClan();
final Clan clan = creature.getActingPlayer().getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
SiegeClan siegeClan = null;
@@ -73,6 +60,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -93,8 +89,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

26
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -44,19 +43,7 @@ public class Die extends ServerPacket
_isSweepable = creature.isAttackable() && creature.isSweepActive();
if (creature.isPlayer())
{
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
final Player player = creature.getActingPlayer();
if (!player.isInTimedHuntingZone())
{
final Clan clan = player.getClan();
final Clan clan = creature.getActingPlayer().getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
SiegeClan siegeClan = null;
@@ -73,6 +60,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -93,8 +89,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

26
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -44,19 +43,7 @@ public class Die extends ServerPacket
_isSweepable = creature.isAttackable() && creature.isSweepActive();
if (creature.isPlayer())
{
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
final Player player = creature.getActingPlayer();
if (!player.isInTimedHuntingZone())
{
final Clan clan = player.getClan();
final Clan clan = creature.getActingPlayer().getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
SiegeClan siegeClan = null;
@@ -73,6 +60,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -93,8 +89,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

26
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -44,19 +43,7 @@ public class Die extends ServerPacket
_isSweepable = creature.isAttackable() && creature.isSweepActive();
if (creature.isPlayer())
{
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
final Player player = creature.getActingPlayer();
if (!player.isInTimedHuntingZone())
{
final Clan clan = player.getClan();
final Clan clan = creature.getActingPlayer().getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
SiegeClan siegeClan = null;
@@ -73,6 +60,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -93,8 +89,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

26
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -44,19 +43,7 @@ public class Die extends ServerPacket
_isSweepable = creature.isAttackable() && creature.isSweepActive();
if (creature.isPlayer())
{
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
final Player player = creature.getActingPlayer();
if (!player.isInTimedHuntingZone())
{
final Clan clan = player.getClan();
final Clan clan = creature.getActingPlayer().getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
SiegeClan siegeClan = null;
@@ -73,6 +60,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -93,8 +89,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

26
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager;
import org.l2jmobius.gameserver.instancemanager.FortManager;
import org.l2jmobius.gameserver.model.SiegeClan;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.model.siege.Fort;
@@ -44,19 +43,7 @@ public class Die extends ServerPacket
_isSweepable = creature.isAttackable() && creature.isSweepActive();
if (creature.isPlayer())
{
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
final Player player = creature.getActingPlayer();
if (!player.isInTimedHuntingZone())
{
final Clan clan = player.getClan();
final Clan clan = creature.getActingPlayer().getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
SiegeClan siegeClan = null;
@@ -73,6 +60,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -93,8 +89,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

23
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -52,18 +52,6 @@ public class Die extends ServerPacket
if (creature.isPlayer())
{
_player = creature.getActingPlayer();
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
if (!_player.isInTimedHuntingZone())
{
final Clan clan = _player.getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
@@ -81,6 +69,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -101,8 +98,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{

23
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
View File

@@ -52,18 +52,6 @@ public class Die extends ServerPacket
if (creature.isPlayer())
{
_player = creature.getActingPlayer();
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
if (!_player.isInTimedHuntingZone())
{
final Clan clan = _player.getClan();
boolean isInCastleDefense = false;
boolean isInFortDefense = false;
@@ -81,6 +69,15 @@ public class Die extends ServerPacket
isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan);
}
for (BuffInfo effect : creature.getEffectList().getEffects())
{
if (effect.getSkill().getId() == CommonSkill.FEATHER_OF_BLESSING.getId())
{
_delayFeather = effect.getTime();
break;
}
}
// ClanHall check.
if ((clan != null) && (clan.getHideoutId() > 0))
{
@@ -101,8 +98,6 @@ public class Die extends ServerPacket
{
_flags += 16;
}
}
// Feather check.
if (creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection())
{