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

Moved auto buff isAlikeDead check with other buff checks.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-09 22:52:48 +00:00
parent 9501a97a6a
commit 72de447144
10 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

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

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

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

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {

7
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -227,7 +227,7 @@ public class AutoUseTaskManager implements Runnable
// Playable target cast. // Playable target cast.
final Playable caster = pet != null ? pet : player; final Playable caster = pet != null ? pet : player;
if ((target != null) && target.isPlayable() && !((Playable) target).isAlikeDead() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0)) if ((target != null) && target.isPlayable() && (target.getActingPlayer().getPvpFlag() == 0) && (target.getActingPlayer().getReputation() >= 0))
{ {
caster.doCast(skill); caster.doCast(skill);
} }
@@ -381,6 +381,11 @@ public class AutoUseTaskManager implements Runnable
} }
} }
if ((target != null) && target.isCreature() && ((Creature) target).isAlikeDead() && (skill.getTargetType() != TargetType.SELF) && (skill.getTargetType() != TargetType.NPC_BODY) && (skill.getTargetType() != TargetType.PC_BODY))
{
return false;
}
final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target; final Playable playableTarget = (target == null) || !target.isPlayable() || (skill.getTargetType() == TargetType.SELF) ? player : (Playable) target;
if (!canUseMagic(player, playableTarget, skill)) if (!canUseMagic(player, playableTarget, skill))
{ {