Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 22:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge Task#scheduleForShutdown into Task#schedule

Browse Source
This commit is contained in:
Matthew 2021-08-23 19:37:10 +02:00 committed by Matt Worzala
parent 1c92414cad
commit 75964f87b4
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/net/minestom/server/timer/Task.java
View File

@ -100,25 +100,25 @@ public class Task implements Runnable {
* Sets up the task for correct execution. * Sets up the task for correct execution.
*/ */
public void schedule() { public void schedule() {
Int2ObjectMap<Task> tasks = this.schedulerManager.tasks; if(this.shutdown) {
synchronized (tasks) { Int2ObjectMap<Task> shutdownTasks = this.schedulerManager.shutdownTasks;
tasks.put(getId(), this); synchronized (shutdownTasks) {
} shutdownTasks.put(getId(), this);
if(owningExtension != null) { }
this.schedulerManager.onScheduleFromExtension(owningExtension, this); if (owningExtension != null) {
} this.schedulerManager.onScheduleShutdownFromExtension(owningExtension, this);
this.future = this.repeat == 0L ? }
this.schedulerManager.getTimerExecutionService().schedule(this, this.delay, TimeUnit.MILLISECONDS) : } else {
this.schedulerManager.getTimerExecutionService().scheduleAtFixedRate(this, this.delay, this.repeat, TimeUnit.MILLISECONDS); Int2ObjectMap<Task> tasks = this.schedulerManager.tasks;
} synchronized (tasks) {
tasks.put(getId(), this);
public void scheduleForShutdown() { }
Int2ObjectMap<Task> shutdownTasks = this.schedulerManager.shutdownTasks; if (owningExtension != null) {
synchronized (shutdownTasks) { this.schedulerManager.onScheduleFromExtension(owningExtension, this);
shutdownTasks.put(getId(), this); }
} this.future = this.repeat == 0L ?
if (owningExtension != null) { this.schedulerManager.getTimerExecutionService().schedule(this, this.delay, TimeUnit.MILLISECONDS) :
this.schedulerManager.onScheduleShutdownFromExtension(owningExtension, this); this.schedulerManager.getTimerExecutionService().scheduleAtFixedRate(this, this.delay, this.repeat, TimeUnit.MILLISECONDS);
} }
} }

6
src/main/java/net/minestom/server/timer/TaskBuilder.java
View File

@ -162,11 +162,7 @@ public class TaskBuilder {
@NotNull @NotNull
public Task schedule() { public Task schedule() {
Task task = build(); Task task = build();
if (this.shutdown) { task.schedule();
task.scheduleForShutdown();
} else {
task.schedule();
}
return task; return task;
} }
} }