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

Self targeting for non playable targets.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2021-07-22 22:11:42 +00:00
parent 7343289250
commit 5adec1331e
8 changed files with 120 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}

19
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -179,9 +179,21 @@ public class AutoUseTaskManager
continue BUFFS;
}
if (canCastBuff(player, skill))
final WorldObject target = player.getTarget();
if (canCastBuff(player, target, skill))
{
player.doCast(skill);
// Playable target cast.
if ((target != null) && target.isPlayable())
{
player.doCast(skill);
}
else // Target self, cast and re-target.
{
final WorldObject savedTarget = target;
player.setTarget(player);
player.doCast(skill);
player.setTarget(savedTarget);
}
}
}
@@ -273,7 +285,7 @@ public class AutoUseTaskManager
}, 1000, 1000);
}
private boolean canCastBuff(PlayerInstance player, Skill skill)
private boolean canCastBuff(PlayerInstance player, WorldObject target, Skill skill)
{
// Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@@ -296,7 +308,6 @@ public class AutoUseTaskManager
}
}
final WorldObject target = player.getTarget();
return !((target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target).isAffectedBySkill(skill.getId()) && canUseMagic(player, target, skill);
}