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

Fixed unstuck timer config.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2020-07-18 00:29:44 +00:00
parent 7c0153b401
commit 626a768300
15 changed files with 180 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor

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

@ -99,7 +99,7 @@ public class SkillCaster implements Runnable
private ScheduledFuture<?> _task; private ScheduledFuture<?> _task;
private int _phase; private int _phase;
private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed) private SkillCaster(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
{ {
Objects.requireNonNull(caster); Objects.requireNonNull(caster);
Objects.requireNonNull(skill); Objects.requireNonNull(skill);
@ -111,7 +111,7 @@ public class SkillCaster implements Runnable
_item = item; _item = item;
_castingType = castingType; _castingType = castingType;
calcSkillTiming(caster, skill); calcSkillTiming(caster, skill, castTime);
} }
/** /**
@ -174,7 +174,7 @@ public class SkillCaster implements Runnable
} }
// Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling). // Schedule a thread that will execute 500ms before casting time is over (for animation issues and retail handling).
final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed); final SkillCaster skillCaster = new SkillCaster(caster, target, skill, item, castingType, ctrlPressed, shiftPressed, castTime);
skillCaster.run(); skillCaster.run();
return skillCaster; return skillCaster;
} }
@ -766,7 +766,7 @@ public class SkillCaster implements Runnable
} }
} }
private void calcSkillTiming(Creature creature, Skill skill) private void calcSkillTiming(Creature creature, Skill skill, int castTime)
{ {
final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill); final double timeFactor = Formulas.calcSkillTimeFactor(creature, skill);
final double cancelTime = Formulas.calcSkillCancelTime(creature, skill); final double cancelTime = Formulas.calcSkillCancelTime(creature, skill);
@ -777,7 +777,14 @@ public class SkillCaster implements Runnable
} }
else else
{ {
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0); if (castTime > -1)
{
_hitTime = (int) Math.max((castTime / timeFactor) - cancelTime, 0);
}
else
{
_hitTime = (int) Math.max((skill.getHitTime() / timeFactor) - cancelTime, 0);
}
_cancelTime = (int) cancelTime; _cancelTime = (int) cancelTime;
} }
_coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor _coolTime = (int) (skill.getCoolTime() / timeFactor); // cooltimeMillis / timeFactor