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

Previous commit adapted for newer branches.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2020-09-26 11:01:25 +00:00
parent 1304c34d2f
commit 847da4664a
15 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -92,6 +92,7 @@ public class SkillCaster implements Runnable
private final Skill _skill;
private final ItemInstance _item;
private final SkillCastingType _castingType;
private final boolean _shiftPressed;
private int _hitTime;
private int _cancelTime;
private int _coolTime;
@ -110,6 +111,7 @@ public class SkillCaster implements Runnable
_skill = skill;
_item = item;
_castingType = castingType;
_shiftPressed = shiftPressed;
calcSkillTiming(caster, skill, castTime);
}
@ -747,7 +749,7 @@ public class SkillCaster implements Runnable
// Attack target after skill use.
if ((_skill.getNextAction() != NextActionType.NONE) && (caster.getAI().getNextIntention() == null))
{
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster))
if ((_skill.getNextAction() == NextActionType.ATTACK) && (target != null) && (target != caster) && target.isAutoAttackable(caster) && !_shiftPressed)
{
caster.getAI().setIntention(AI_INTENTION_ATTACK, target);
}