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

Improved L2DefenderInstance beneficial magic targeting.

Browse Source
This commit is contained in:
MobiusDev
2017-11-12 02:33:38 +00:00
parent 2df83af9f6
commit a7fdaaf2fd
5 changed files with 90 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java
View File

@@ -182,25 +182,33 @@ public class L2DefenderInstance extends L2Attackable
if (!skill.isBad()) if (!skill.isBad())
{ {
L2Character target = this; L2Character target = this;
double lowestHpValue = Double.MAX_VALUE;
for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange()))
{ {
if (nearby == this) if ((nearby == null) || nearby.isDead())
{ {
continue; continue;
} }
if (nearby instanceof L2DefenderInstance) if (nearby instanceof L2DefenderInstance)
{
final double targetHp = nearby.getCurrentHp();
if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
} }
if (nearby.isPlayer()) }
else if (nearby.isPlayer())
{ {
final L2PcInstance player = (L2PcInstance) nearby; final L2PcInstance player = (L2PcInstance) nearby;
final Castle castle = getCastle(); if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(getScriptValue()))
final Fort fortress = getFort(); {
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0)); final double targetHp = nearby.getCurrentHp();
if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
}
} }
} }
} }

20
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java
View File

@@ -182,25 +182,33 @@ public class L2DefenderInstance extends L2Attackable
if (!skill.isBad()) if (!skill.isBad())
{ {
L2Character target = this; L2Character target = this;
double lowestHpValue = Double.MAX_VALUE;
for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange()))
{ {
if (nearby == this) if ((nearby == null) || nearby.isDead())
{ {
continue; continue;
} }
if (nearby instanceof L2DefenderInstance) if (nearby instanceof L2DefenderInstance)
{
final double targetHp = nearby.getCurrentHp();
if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
} }
if (nearby.isPlayer()) }
else if (nearby.isPlayer())
{ {
final L2PcInstance player = (L2PcInstance) nearby; final L2PcInstance player = (L2PcInstance) nearby;
final Castle castle = getCastle(); if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(getScriptValue()))
final Fort fortress = getFort(); {
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0)); final double targetHp = nearby.getCurrentHp();
if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
}
} }
} }
} }

20
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java
View File

@@ -182,25 +182,33 @@ public class L2DefenderInstance extends L2Attackable
if (!skill.isBad()) if (!skill.isBad())
{ {
L2Character target = this; L2Character target = this;
double lowestHpValue = Double.MAX_VALUE;
for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange()))
{ {
if (nearby == this) if ((nearby == null) || nearby.isDead())
{ {
continue; continue;
} }
if (nearby instanceof L2DefenderInstance) if (nearby instanceof L2DefenderInstance)
{
final double targetHp = nearby.getCurrentHp();
if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
} }
if (nearby.isPlayer()) }
else if (nearby.isPlayer())
{ {
final L2PcInstance player = (L2PcInstance) nearby; final L2PcInstance player = (L2PcInstance) nearby;
final Castle castle = getCastle(); if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(getScriptValue()))
final Fort fortress = getFort(); {
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0)); final double targetHp = nearby.getCurrentHp();
if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
}
} }
} }
} }

20
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java
View File

@@ -182,25 +182,33 @@ public class L2DefenderInstance extends L2Attackable
if (!skill.isBad()) if (!skill.isBad())
{ {
L2Character target = this; L2Character target = this;
double lowestHpValue = Double.MAX_VALUE;
for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange()))
{ {
if (nearby == this) if ((nearby == null) || nearby.isDead())
{ {
continue; continue;
} }
if (nearby instanceof L2DefenderInstance) if (nearby instanceof L2DefenderInstance)
{
final double targetHp = nearby.getCurrentHp();
if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
} }
if (nearby.isPlayer()) }
else if (nearby.isPlayer())
{ {
final L2PcInstance player = (L2PcInstance) nearby; final L2PcInstance player = (L2PcInstance) nearby;
final Castle castle = getCastle(); if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(getScriptValue()))
final Fort fortress = getFort(); {
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0)); final double targetHp = nearby.getCurrentHp();
if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
}
} }
} }
} }

20
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java
View File

@@ -182,25 +182,33 @@ public class L2DefenderInstance extends L2Attackable
if (!skill.isBad()) if (!skill.isBad())
{ {
L2Character target = this; L2Character target = this;
double lowestHpValue = Double.MAX_VALUE;
for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange())) for (L2Character nearby : L2World.getInstance().getVisibleObjects(this, L2Character.class, skill.getCastRange()))
{ {
if (nearby == this) if ((nearby == null) || nearby.isDead())
{ {
continue; continue;
} }
if (nearby instanceof L2DefenderInstance) if (nearby instanceof L2DefenderInstance)
{
final double targetHp = nearby.getCurrentHp();
if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
} }
if (nearby.isPlayer()) }
else if (nearby.isPlayer())
{ {
final L2PcInstance player = (L2PcInstance) nearby; final L2PcInstance player = (L2PcInstance) nearby;
final Castle castle = getCastle(); if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(getScriptValue()))
final Fort fortress = getFort(); {
final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : 0)); final double targetHp = nearby.getCurrentHp();
if ((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) if (lowestHpValue > targetHp)
{ {
target = nearby; target = nearby;
lowestHpValue = targetHp;
}
} }
} }
} }