98 lines
4.4 KiB
Diff
98 lines
4.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Thu, 1 Jul 2021 11:59:11 +0000
|
|
Subject: [PATCH] Remove TickTask
|
|
|
|
Original code by PatinaMC, licensed under GNU General Public License v3.0
|
|
You can find the original code on https://github.com/PatinaMC/Patina
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index babc3235c8e7d1e45c21e42184a4c1a13485d950..8d511ce78d6a7d305cb158482ebe3946e7e210fa 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -186,7 +186,7 @@ import org.bukkit.event.server.ServerLoadEvent;
|
|
import co.aikar.timings.MinecraftTimings; // Paper
|
|
import org.spigotmc.SlackActivityAccountant; // Spigot
|
|
|
|
-public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, AutoCloseable {
|
|
+public abstract class MinecraftServer extends ReentrantBlockableEventLoop<Runnable> implements CommandSource, AutoCloseable { // Patina
|
|
|
|
private static MinecraftServer SERVER; // Paper
|
|
public static final Logger LOGGER = LogManager.getLogger();
|
|
@@ -1367,19 +1367,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
}
|
|
|
|
@Override
|
|
- public TickTask wrapRunnable(Runnable runnable) {
|
|
+ public Runnable wrapRunnable(Runnable runnable) { // Patina
|
|
// Paper start - anything that does try to post to main during watchdog crash, run on watchdog
|
|
if (this.hasStopped && Thread.currentThread().equals(shutdownThread)) {
|
|
runnable.run();
|
|
runnable = () -> {};
|
|
}
|
|
// Paper end
|
|
- return new TickTask(this.tickCount, runnable);
|
|
+ return runnable; // Patina
|
|
}
|
|
|
|
+ /* // Patina
|
|
protected boolean shouldRun(TickTask ticktask) {
|
|
return ticktask.getTick() + 3 < this.tickCount || this.haveTime();
|
|
}
|
|
+ */
|
|
|
|
@Override
|
|
public boolean pollTask() {
|
|
@@ -1411,10 +1413,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
}
|
|
}
|
|
|
|
+ /* // Patina
|
|
public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
|
|
this.getProfiler().incrementCounter("runTask");
|
|
super.doRunTask(ticktask);
|
|
}
|
|
+ */
|
|
|
|
private void updateStatusIcon(ServerStatus metadata) {
|
|
Optional<File> optional = Optional.of(this.getFile("server-icon.png")).filter(File::isFile);
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
index addf249717b5271b664f4a9d28dd6cc177db5688..d63d923562878e00cd0c95d3b46a11ee68932011 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
@@ -1264,10 +1264,12 @@ public class ServerChunkCache extends ChunkSource {
|
|
return runnable;
|
|
}
|
|
|
|
+ /* // Patina
|
|
@Override
|
|
protected boolean shouldRun(Runnable task) {
|
|
return true;
|
|
}
|
|
+ */
|
|
|
|
@Override
|
|
protected boolean scheduleExecutables() {
|
|
diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
|
index dcce05d2f4ab16424db4ab103a12188e207a457b..540aa5e12bb6b44d510c701f2867f541b07ebcc4 100644
|
|
--- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
|
+++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
|
@@ -29,7 +29,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
|
|
|
|
protected abstract R wrapRunnable(Runnable runnable);
|
|
|
|
- protected abstract boolean shouldRun(R task);
|
|
+ //protected abstract boolean shouldRun(R task); // Patina
|
|
|
|
public boolean isSameThread() {
|
|
return Thread.currentThread() == this.getRunningThread();
|
|
@@ -116,7 +116,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
|
|
R runnable = this.pendingRunnables.peek();
|
|
if (runnable == null) {
|
|
return false;
|
|
- } else if (this.blockingCount == 0 && !this.shouldRun(runnable)) {
|
|
+ } else if (this.blockingCount == 0 && !true/*this.shouldRun(runnable)*/) { // Patina
|
|
return false;
|
|
} else {
|
|
this.doRunTask(this.pendingRunnables.remove());
|