From ce3055a069f98edd960682c344b6b8ddc09049a3 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 25 Aug 2019 22:57:41 +0200 Subject: [PATCH] Fixed Infused Magnet working in Spectator Mode --- .../Slimefun/Objects/tasks/SlimefunTask.java | 12 +++++++----- src/me/mrCookieSlime/Slimefun/api/TickerTask.java | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/SlimefunTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/SlimefunTask.java index 18f03eb08..2a4f157e4 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/SlimefunTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/SlimefunTask.java @@ -6,21 +6,23 @@ import org.bukkit.entity.Player; import java.util.UUID; public abstract class SlimefunTask implements Runnable { + protected UUID uuid; protected int id; + protected Player p; - public SlimefunTask(Player p){ + public SlimefunTask(Player p) { + this.p = p; this.uuid = p.getUniqueId(); } - public void setID(int id){ + public void setID(int id) { this.id = id; } @Override public void run() { - if(cancelTask()) - return; + if(cancelTask()) return; executeTask(); } @@ -28,7 +30,7 @@ public abstract class SlimefunTask implements Runnable { * * @return True if task was cancelled. */ - private boolean cancelTask(){ + protected boolean cancelTask(){ if(Bukkit.getPlayer(uuid) == null || Bukkit.getPlayer(uuid).isDead() || !Bukkit.getPlayer(uuid).isSneaking()) { Bukkit.getScheduler().cancelTask(id); return true; diff --git a/src/me/mrCookieSlime/Slimefun/api/TickerTask.java b/src/me/mrCookieSlime/Slimefun/api/TickerTask.java index 6a5d2b7d7..40fbf9c91 100644 --- a/src/me/mrCookieSlime/Slimefun/api/TickerTask.java +++ b/src/me/mrCookieSlime/Slimefun/api/TickerTask.java @@ -206,6 +206,10 @@ public class TickerTask implements Runnable { time = System.currentTimeMillis() - timestamp; } + + public long getTime() { + return time; + } public void info(CommandSender sender) { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&2== &aSlimefun Diagnostic Tool &2=="));