Revert "Some revert"

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

View File

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

View File

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