From 7301908ea812a4634648b9f3ee4b3ffafa7fe5b7 Mon Sep 17 00:00:00 2001 From: Steev Date: Mon, 29 Nov 2021 21:22:48 +0100 Subject: [PATCH] added projektile removal in TridentResetTask --- .../Tridentwar/listeners/ProjectileLaunchListener.java | 4 ++-- .../java/de/steev/Tridentwar/tasks/TridentResetTask.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/steev/Tridentwar/listeners/ProjectileLaunchListener.java b/src/main/java/de/steev/Tridentwar/listeners/ProjectileLaunchListener.java index 99967af..b0c81ed 100644 --- a/src/main/java/de/steev/Tridentwar/listeners/ProjectileLaunchListener.java +++ b/src/main/java/de/steev/Tridentwar/listeners/ProjectileLaunchListener.java @@ -21,8 +21,8 @@ public class ProjectileLaunchListener implements Listener { @EventHandler public void OnProjectileLaunch(ProjectileLaunchEvent event){ - this.tridentResetTask = new TridentResetTask(this.gameManager, (Player)event.getEntity().getShooter()); - this.tridentResetTask.runTaskLater(plugin, 300); + this.tridentResetTask = new TridentResetTask(this.gameManager, (Player)event.getEntity().getShooter(), event.getEntity()); + this.tridentResetTask.runTaskLater(plugin, 1000); gameManager.getTridentManager().setTasks((Player)event.getEntity().getShooter(), this.tridentResetTask); } } diff --git a/src/main/java/de/steev/Tridentwar/tasks/TridentResetTask.java b/src/main/java/de/steev/Tridentwar/tasks/TridentResetTask.java index 5bce939..9abea4c 100644 --- a/src/main/java/de/steev/Tridentwar/tasks/TridentResetTask.java +++ b/src/main/java/de/steev/Tridentwar/tasks/TridentResetTask.java @@ -2,6 +2,7 @@ package de.steev.Tridentwar.tasks; import de.steev.Tridentwar.manager.GameManager; import org.bukkit.Material; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; @@ -10,14 +11,17 @@ public class TridentResetTask extends BukkitRunnable { private GameManager gameManager; private Player thrower; + private Entity projektile; - public TridentResetTask (GameManager gameManager, Player thrower) { + public TridentResetTask (GameManager gameManager, Player thrower, Entity projektile) { this.gameManager = gameManager; this.thrower = thrower; + this.projektile = projektile; } @Override public void run() { + projektile.remove(); thrower.getInventory().addItem(new ItemStack(Material.TRIDENT)); } }