From b97840a320e89470b6148c31c0c60c65b83b3216 Mon Sep 17 00:00:00 2001 From: HaHaWTH Date: Sun, 14 Jan 2024 12:56:20 +0800 Subject: [PATCH] Folia Support --- src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java | 8 ++++---- src/main/java/fr/xephi/authme/service/AntiBotService.java | 4 ++-- src/main/java/fr/xephi/authme/service/BukkitService.java | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java index 34e73196..55f172b6 100644 --- a/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java +++ b/src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java @@ -1,8 +1,8 @@ package fr.xephi.authme.data.limbo; +import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask; import fr.xephi.authme.task.MessageTask; import org.bukkit.Location; -import org.bukkit.scheduler.BukkitTask; import java.util.ArrayList; import java.util.Collection; @@ -22,7 +22,7 @@ public class LimboPlayer { private final Location loc; private final float walkSpeed; private final float flySpeed; - private BukkitTask timeoutTask = null; + private MyScheduledTask timeoutTask = null; private MessageTask messageTask = null; private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED; @@ -81,7 +81,7 @@ public class LimboPlayer { * * @return The timeout task associated to the player */ - public BukkitTask getTimeoutTask() { + public MyScheduledTask getTimeoutTask() { return timeoutTask; } @@ -91,7 +91,7 @@ public class LimboPlayer { * * @param timeoutTask The task to set */ - public void setTimeoutTask(BukkitTask timeoutTask) { + public void setTimeoutTask(MyScheduledTask timeoutTask) { if (this.timeoutTask != null) { this.timeoutTask.cancel(); } diff --git a/src/main/java/fr/xephi/authme/service/AntiBotService.java b/src/main/java/fr/xephi/authme/service/AntiBotService.java index 96ff499f..f902a28f 100644 --- a/src/main/java/fr/xephi/authme/service/AntiBotService.java +++ b/src/main/java/fr/xephi/authme/service/AntiBotService.java @@ -1,5 +1,6 @@ package fr.xephi.authme.service; +import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask; import fr.xephi.authme.initialization.SettingsDependent; import fr.xephi.authme.message.MessageKey; import fr.xephi.authme.message.Messages; @@ -8,7 +9,6 @@ import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.properties.ProtectionSettings; import fr.xephi.authme.util.AtomicIntervalCounter; -import org.bukkit.scheduler.BukkitTask; import javax.inject.Inject; import java.util.Locale; @@ -32,7 +32,7 @@ public class AntiBotService implements SettingsDependent { // Service status private AntiBotStatus antiBotStatus; private boolean startup; - private BukkitTask disableTask; + private MyScheduledTask disableTask; private AtomicIntervalCounter flaggedCounter; @Inject diff --git a/src/main/java/fr/xephi/authme/service/BukkitService.java b/src/main/java/fr/xephi/authme/service/BukkitService.java index 87973ce2..7aa311e9 100644 --- a/src/main/java/fr/xephi/authme/service/BukkitService.java +++ b/src/main/java/fr/xephi/authme/service/BukkitService.java @@ -15,7 +15,6 @@ import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.scheduler.BukkitTask; import javax.inject.Inject; import java.util.Collection; @@ -105,8 +104,8 @@ public class BukkitService implements SettingsDependent { * @throws IllegalArgumentException if plugin is null * @throws IllegalArgumentException if task is null */ - public BukkitTask runTaskLater(Runnable task, long delay) { - return (BukkitTask) AuthMe.getScheduler().runTaskLater(task, delay); + public MyScheduledTask runTaskLater(Runnable task, long delay) { + return AuthMe.getScheduler().runTaskLater(task, delay); } /**