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

Addition of isSiegeFriend method.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-11-08 10:52:40 +00:00
parent 6e1df8a43a
commit 6e64ab3dfd
141 changed files with 744 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -935,7 +935,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide()))
else if (getActingPlayer().isSiegeFriend(target))
{
if (TerritoryWarManager.getInstance().isTWInProgress())
{

5
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -53,7 +53,6 @@ import org.l2jmobius.gameserver.model.items.type.ActionType;
import org.l2jmobius.gameserver.model.olympiad.Olympiad;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.skills.targets.TargetType;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.ZoneRegion;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo.SummonInfo;
@@ -680,7 +679,7 @@ public abstract class Summon extends Playable
return false;
}
if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == _owner.getSiegeState()) && (target.getActingPlayer() != _owner) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide()))
if (_owner.isSiegeFriend(target))
{
if (TerritoryWarManager.getInstance().isTWInProgress())
{
@@ -1019,7 +1018,7 @@ public abstract class Summon extends Playable
return false;
}
if ((target.getActingPlayer() != null) && (_owner.getSiegeState() > 0) && _owner.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == _owner.getSiegeSide()))
if (_owner.isSiegeFriend(target))
{
if (TerritoryWarManager.getInstance().isTWInProgress())
{

51
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -1618,6 +1618,41 @@ public class PlayerInstance extends Playable
return _siegeSide;
}
public boolean isSiegeFriend(WorldObject target)
{
// If i'm natural or not in siege zone, not friends.
if ((_siegeState == 0) || !isInsideZone(ZoneId.SIEGE))
{
return false;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final PlayerInstance targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;
}
// Attackers are considered friends only if castle has no owner.
if (_siegeState == 1)
{
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if (castle == null)
{
return false;
}
if (castle.getOwner() == null)
{
return true;
}
return false;
}
// Both are defenders, friends.
return true;
}
/**
* Set the PvP Flag of the PlayerInstance.
* @param pvpFlag
@@ -8928,7 +8963,7 @@ public class PlayerInstance extends Playable
return false;
}
if ((target.getActingPlayer() != null) && (getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getSiegeSide()))
if (isSiegeFriend(target))
{
if (TerritoryWarManager.getInstance().isTWInProgress())
{
@@ -9151,18 +9186,10 @@ public class PlayerInstance extends Playable
}
// Siege
if ((getSiegeState() != 0) && (targetPlayer.getSiegeState() != 0))
if (isSiegeFriend(targetPlayer))
{
// Register for same siege
if (getSiegeSide() == targetPlayer.getSiegeSide())
{
// Same side
if (getSiegeState() == targetPlayer.getSiegeState())
{
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
return false;
}
}
sendPacket(SystemMessageId.FORCE_ATTACK_IS_IMPOSSIBLE_AGAINST_A_TEMPORARY_ALLIED_MEMBER_DURING_A_SIEGE);
return false;
}
// Party