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

BuffInfo cancel task NPE check.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-05-28 22:51:12 +00:00
parent 792877c157
commit e5b9a0b64d
13 changed files with 130 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -309,7 +309,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -320,7 +324,11 @@ public final class BuffInfo
// Cancels the ticking task.
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
// Remove stats
removeStats();

12
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

12
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}

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

@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = task.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
_effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
}
}
@ -381,7 +385,11 @@ public final class BuffInfo
{
for (EffectTaskInfo effectTask : _tasks.values())
{
effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
final ScheduledFuture<?> schedule = effectTask.getScheduledFuture();
if ((schedule != null) && !schedule.isCancelled() && !schedule.isDone())
{
schedule.cancel(true); // Don't allow to finish current run.
}
}
}