Skip to content

Commit 598c673

Browse files
committed
Revert "Revert"
This reverts commit 01e46b5.
1 parent 44e4790 commit 598c673

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package fr.xephi.authme.data.limbo;
22

3+
import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
34
import fr.xephi.authme.task.MessageTask;
45
import org.bukkit.Location;
5-
import org.bukkit.scheduler.BukkitTask;
66

77
import java.util.ArrayList;
88
import java.util.Collection;
@@ -22,7 +22,7 @@ public class LimboPlayer {
2222
private final Location loc;
2323
private final float walkSpeed;
2424
private final float flySpeed;
25-
private BukkitTask timeoutTask = null;
25+
private MyScheduledTask timeoutTask = null;
2626
private MessageTask messageTask = null;
2727

2828
private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED;
@@ -82,7 +82,7 @@ public float getFlySpeed() {
8282
*
8383
* @return The timeout task associated to the player
8484
*/
85-
public BukkitTask getTimeoutTask() {
85+
public MyScheduledTask getTimeoutTask() {
8686
return timeoutTask;
8787
}
8888

@@ -92,7 +92,7 @@ public BukkitTask getTimeoutTask() {
9292
*
9393
* @param timeoutTask The task to set
9494
*/
95-
public void setTimeoutTask(BukkitTask timeoutTask) {
95+
public void setTimeoutTask(MyScheduledTask timeoutTask) {
9696
if (this.timeoutTask != null) {
9797
this.timeoutTask.cancel();
9898
}

src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fr.xephi.authme.data.limbo;
22

3+
import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
34
import fr.xephi.authme.data.auth.PlayerCache;
45
import fr.xephi.authme.data.captcha.RegistrationCaptchaManager;
56
import fr.xephi.authme.message.MessageKey;
@@ -11,7 +12,6 @@
1112
import fr.xephi.authme.task.MessageTask;
1213
import fr.xephi.authme.task.TimeoutTask;
1314
import org.bukkit.entity.Player;
14-
import org.bukkit.scheduler.BukkitTask;
1515

1616
import javax.inject.Inject;
1717

@@ -68,7 +68,7 @@ void registerTimeoutTask(Player player, LimboPlayer limbo) {
6868
final int timeout = settings.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND;
6969
if (timeout > 0) {
7070
String message = messages.retrieveSingle(player, MessageKey.LOGIN_TIMEOUT_ERROR);
71-
BukkitTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
71+
MyScheduledTask task = bukkitService.runTaskLater(new TimeoutTask(player, message, playerCache), timeout);
7272
limbo.setTimeoutTask(task);
7373
}
7474
}

src/main/java/fr/xephi/authme/service/AntiBotService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fr.xephi.authme.service;
22

3+
import com.github.Anon8281.universalScheduler.scheduling.tasks.MyScheduledTask;
34
import fr.xephi.authme.initialization.SettingsDependent;
45
import fr.xephi.authme.message.MessageKey;
56
import fr.xephi.authme.message.Messages;
@@ -8,7 +9,6 @@
89
import fr.xephi.authme.settings.Settings;
910
import fr.xephi.authme.settings.properties.ProtectionSettings;
1011
import fr.xephi.authme.util.AtomicIntervalCounter;
11-
import org.bukkit.scheduler.BukkitTask;
1212

1313
import javax.inject.Inject;
1414
import java.util.Locale;
@@ -32,7 +32,7 @@ public class AntiBotService implements SettingsDependent {
3232
// Service status
3333
private AntiBotStatus antiBotStatus;
3434
private boolean startup;
35-
private BukkitTask disableTask;
35+
private MyScheduledTask disableTask;
3636
private AtomicIntervalCounter flaggedCounter;
3737

3838
@Inject

src/main/java/fr/xephi/authme/service/BukkitService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.bukkit.entity.Entity;
1919
import org.bukkit.entity.Player;
2020
import org.bukkit.event.Event;
21-
import org.bukkit.scheduler.BukkitTask;
2221

2322
import javax.inject.Inject;
2423
import java.util.Collection;
@@ -154,8 +153,8 @@ public void runTaskIfFolia(Location location, Runnable task) {
154153
* @throws IllegalArgumentException if plugin is null
155154
* @throws IllegalArgumentException if task is null
156155
*/
157-
public BukkitTask runTaskLater(Runnable task, long delay) {
158-
return Bukkit.getScheduler().runTaskLater(authMe, task, delay);
156+
public MyScheduledTask runTaskLater(Runnable task, long delay) {
157+
return getScheduler().runTaskLater(task, delay);
159158
}
160159

161160
/**

0 commit comments

Comments
 (0)