mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Fixed Infused Magnet working in Spectator Mode

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-08-25 22:57:41 +02:00
parent cdb43b15ee
commit ce3055a069
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/me/mrCookieSlime/Slimefun/Objects/tasks/SlimefunTask.java
View File

@ -6,21 +6,23 @@ import org.bukkit.entity.Player;
import java.util.UUID; import java.util.UUID;
public abstract class SlimefunTask implements Runnable { public abstract class SlimefunTask implements Runnable {
protected UUID uuid; protected UUID uuid;
protected int id; protected int id;
protected Player p;
public SlimefunTask(Player p){ public SlimefunTask(Player p) {
this.p = p;
this.uuid = p.getUniqueId(); this.uuid = p.getUniqueId();
} }
public void setID(int id){ public void setID(int id) {
this.id = id; this.id = id;
} }
@Override @Override
public void run() { public void run() {
if(cancelTask()) if(cancelTask()) return;
return;
executeTask(); executeTask();
} }
@ -28,7 +30,7 @@ public abstract class SlimefunTask implements Runnable {
* *
* @return True if task was cancelled. * @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()) { if(Bukkit.getPlayer(uuid) == null || Bukkit.getPlayer(uuid).isDead() || !Bukkit.getPlayer(uuid).isSneaking()) {
Bukkit.getScheduler().cancelTask(id); Bukkit.getScheduler().cancelTask(id);
return true; return true;

4
src/me/mrCookieSlime/Slimefun/api/TickerTask.java
View File

@ -206,6 +206,10 @@ public class TickerTask implements Runnable {
time = System.currentTimeMillis() - timestamp; time = System.currentTimeMillis() - timestamp;
} }
public long getTime() {
return time;
}
public void info(CommandSender sender) { public void info(CommandSender sender) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&2== &aSlimefun Diagnostic Tool &2==")); sender.sendMessage(ChatColor.translateAlternateColorCodes('&', "&2== &aSlimefun Diagnostic Tool &2=="));