BuffInfo cancel task NPE check.

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

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -309,7 +309,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _effected.getEffectList().stopSkillEffects(true, _skill); // Remove the buff from the effect list.
} }
} }
@@ -320,7 +324,11 @@ public final class BuffInfo
// Cancels the ticking task. // Cancels the ticking task.
for (EffectTaskInfo effectTask : _tasks.values()) 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 // Remove stats
removeStats(); removeStats();

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }

View File

@@ -368,7 +368,11 @@ public final class BuffInfo
final EffectTaskInfo task = getEffectTask(effect); final EffectTaskInfo task = getEffectTask(effect);
if (task != null) 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. _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()) 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.
}
} }
} }