Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Some revert"

Browse Source 
This reverts commit 797aadb328f337ef1edf1544122e2ba42ea3aa3d.
This commit is contained in:
HaHaWTH 2024-03-27 22:13:17 +08:00
parent 797905d050
commit abeaa249b8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/fr/xephi/authme/data/limbo/LimboPlayer.java
View File

@ -24,6 +24,7 @@ public class LimboPlayer {
private final float flySpeed; private final float flySpeed;
private MyScheduledTask timeoutTask = null; private MyScheduledTask timeoutTask = null;
private MessageTask messageTask = null; private MessageTask messageTask = null;
private MyScheduledTask inter;
private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED; private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED;
@ -113,18 +114,20 @@ public class LimboPlayer {
* *
* @param messageTask The message task to set * @param messageTask The message task to set
*/ */
public void setMessageTask(MessageTask messageTask) { public void setMessageTask(MessageTask messageTask, MyScheduledTask inter) {
if (this.messageTask != null) { if (this.messageTask != null && this.inter != null) {
this.messageTask.cancel(); this.messageTask.cancel();
this.inter.cancel();
} }
this.messageTask = messageTask; this.messageTask = messageTask;
this.inter = inter;
} }
/** /**
* Clears all tasks associated to the player. * Clears all tasks associated to the player.
*/ */
public void clearTasks() { public void clearTasks() {
setMessageTask(null); setMessageTask(null, null);
setTimeoutTask(null); setTimeoutTask(null);
} }

4
src/main/java/fr/xephi/authme/data/limbo/LimboPlayerTaskManager.java
View File

@ -53,8 +53,8 @@ class LimboPlayerTaskManager {
if (interval > 0) { if (interval > 0) {
String[] joinMessage = messages.retrieveSingle(player, result.messageKey, result.args).split("\n"); String[] joinMessage = messages.retrieveSingle(player, result.messageKey, result.args).split("\n");
MessageTask messageTask = new MessageTask(player, joinMessage); MessageTask messageTask = new MessageTask(player, joinMessage);
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, (long) interval * TICKS_PER_SECOND); MyScheduledTask task = bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, (long) interval * TICKS_PER_SECOND);
limbo.setMessageTask(messageTask); limbo.setMessageTask(messageTask, task);
} }
} }