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

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Enemy.java vendored
View File

@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
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.network.SystemMessageId;
/**
@@ -127,7 +126,7 @@ public class Enemy implements ITargetTypeHandler
// Is this check still actual?
if (forceUse && (target.getActingPlayer() != null) && (creature.getActingPlayer() != null))
{
if ((creature.getActingPlayer().getSiegeState() > 0) && creature.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == creature.getActingPlayer().getSiegeState()) && (target.getActingPlayer() != creature.getActingPlayer()) && (target.getActingPlayer().getSiegeSide() == creature.getActingPlayer().getSiegeSide()))
if (creature.getActingPlayer().isSiegeFriend(target))
{
if (sendMessage)
{

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java vendored
View File

@@ -22,7 +22,6 @@ import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
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.network.SystemMessageId;
/**
@@ -127,7 +126,7 @@ public class EnemyOnly implements ITargetTypeHandler
// Is this check still actual?
if ((target.getActingPlayer() != null) && (creature.getActingPlayer() != null))
{
if ((creature.getActingPlayer().getSiegeState() > 0) && creature.isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == creature.getActingPlayer().getSiegeState()) && (target.getActingPlayer() != creature.getActingPlayer()) && (target.getActingPlayer().getSiegeSide() == creature.getActingPlayer().getSiegeSide()))
if (creature.getActingPlayer().isSiegeFriend(target))
{
if (sendMessage)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/Friend.java vendored
View File

@@ -103,7 +103,7 @@ public class Friend implements IAffectObjectHandler
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
if (player.isSiegeFriend(targetPlayer))
{
return true;
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/FriendPc.java vendored
View File

@@ -101,7 +101,7 @@ public class FriendPc implements IAffectObjectHandler
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
if (player.isSiegeFriend(targetPlayer))
{
return true;
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@@ -112,7 +112,7 @@ public class NotFriend implements IAffectObjectHandler
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
if (player.isSiegeFriend(targetPlayer))
{
return false;
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java vendored
View File

@@ -112,7 +112,7 @@ public class NotFriendPc implements IAffectObjectHandler
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
if (player.isSiegeFriend(targetPlayer))
{
return false;
}