Some revert
This commit is contained in:
parent
4c918925d8
commit
797aadb328
@ -24,7 +24,6 @@ public class LimboPlayer {
|
||||
private final float flySpeed;
|
||||
private MyScheduledTask timeoutTask = null;
|
||||
private MessageTask messageTask = null;
|
||||
private MyScheduledTask inter;
|
||||
|
||||
private LimboPlayerState state = LimboPlayerState.PASSWORD_REQUIRED;
|
||||
|
||||
@ -114,20 +113,18 @@ public class LimboPlayer {
|
||||
*
|
||||
* @param messageTask The message task to set
|
||||
*/
|
||||
public void setMessageTask(MessageTask messageTask, MyScheduledTask inter) {
|
||||
if (this.messageTask != null && this.inter != null) {
|
||||
public void setMessageTask(MessageTask messageTask) {
|
||||
if (this.messageTask != 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, null);
|
||||
setMessageTask(null);
|
||||
setTimeoutTask(null);
|
||||
}
|
||||
|
||||
|
||||
@ -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);
|
||||
MyScheduledTask task = bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, (long) interval * TICKS_PER_SECOND);
|
||||
limbo.setMessageTask(messageTask, task);
|
||||
bukkitService.runTaskTimer(messageTask, 2 * TICKS_PER_SECOND, (long) interval * TICKS_PER_SECOND);
|
||||
limbo.setMessageTask(messageTask);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user