From 1bbb0805038ac8b35a676245c09d86f6aae7b246 Mon Sep 17 00:00:00 2001
From: NeumimTo <chleba48@gmail.com>
Date: Sun, 9 Jul 2017 16:03:53 +0200
Subject: [PATCH] cancel the task

---
 .../java/cz/neumimto/rpg/gui/VanilaMessaging.java    |  2 ++
 Skills/src/main/java/cz/neumimto/SkillListener.java  | 12 ------------
 .../effects/decoration/ParticleDecorator.java        | 12 +++++++-----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Plugin/src/main/java/cz/neumimto/rpg/gui/VanilaMessaging.java b/Plugin/src/main/java/cz/neumimto/rpg/gui/VanilaMessaging.java
index 4c48dd479..7364f3f2a 100644
--- a/Plugin/src/main/java/cz/neumimto/rpg/gui/VanilaMessaging.java
+++ b/Plugin/src/main/java/cz/neumimto/rpg/gui/VanilaMessaging.java
@@ -56,6 +56,8 @@
 import org.spongepowered.api.Game;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.data.key.Keys;
+import org.spongepowered.api.entity.ArmorEquipable;
+import org.spongepowered.api.entity.living.monster.ZombiePigman;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.cause.Cause;
diff --git a/Skills/src/main/java/cz/neumimto/SkillListener.java b/Skills/src/main/java/cz/neumimto/SkillListener.java
index 10011460a..4e17762a0 100644
--- a/Skills/src/main/java/cz/neumimto/SkillListener.java
+++ b/Skills/src/main/java/cz/neumimto/SkillListener.java
@@ -266,16 +266,4 @@ public void onBlockInteract(InteractBlockEvent event, @First(typeFilter = Player
         }
     }
 
-    @Listener
-    public void onArrowFire(LaunchProjectileEvent event, @First(typeFilter = Entity.class) Entity e ){
-
-        Decorator.createTrajectory(
-                event.getTargetEntity(),
-                1,
-                1,
-                new ParticleDecorator.SIMPLE_TRAJECTORY(
-                        ParticleEffect.builder()
-                                .quantity(5).type(ParticleTypes.AMBIENT_MOB_SPELL).build()));
-    }
-
 }
diff --git a/Skills/src/main/java/cz/neumimto/effects/decoration/ParticleDecorator.java b/Skills/src/main/java/cz/neumimto/effects/decoration/ParticleDecorator.java
index 87db73643..9920a1344 100644
--- a/Skills/src/main/java/cz/neumimto/effects/decoration/ParticleDecorator.java
+++ b/Skills/src/main/java/cz/neumimto/effects/decoration/ParticleDecorator.java
@@ -36,15 +36,17 @@ public void strikeLightning(Location<World> location) {
 
 	@Override
 	public void createTrajectory(Entity entity, int interval, int maxticks, BiConsumer<Task, Entity> e) {
-		Sponge.getScheduler()
+		Task submit = Sponge.getScheduler()
 				.createTaskBuilder()
 				.delay(1L, TimeUnit.MILLISECONDS)
 				.interval(interval, TimeUnit.MILLISECONDS)
 				.execute((task -> {
-			if (!entity.isRemoved()) {
-				e.accept(task, entity);
-			}
-		})).submit(plugin);
+					if (!entity.isRemoved()) {
+						e.accept(task, entity);
+					} else {
+						task.cancel();
+					}
+				})).submit(plugin);
 	}
 
 	public static class SIMPLE_TRAJECTORY implements BiConsumer<Task, Entity> {