SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Even more cleanup of mcutil patch

Browse Source
This commit is contained in:
Nassim Jahnke
2024-07-18 16:50:16 +02:00
parent 0b2291042a
commit dc136446fb
12 changed files with 96 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/Timings-v2.patch
View File

@@ -1833,16 +1833,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.ArrayList;
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
}
public BukkitTask scheduleInternalTask(Runnable run, int delay, String taskName) {
- final CraftTask task = new CraftTask(run, nextId(), taskName);
+ final CraftTask task = new CraftTask(run, nextId(), "Internal - " + (taskName != null ? taskName : "Unknown"));
+ task.internal = true;
return handle(task, delay);
}
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
}
return false;
@@ -1869,8 +1859,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
task.run();
- task.timings.stopTiming(); // Spigot
} catch (final Throwable throwable) {
// Paper start
String msg = String.format(
task.getOwner().getLogger().log(
Level.WARNING,
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
this.runners.remove(task.getTaskId());
}
@@ -1936,15 +1926,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
CraftTask() {
this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
}
@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this.id = id;
this.period = CraftTask.NO_REPEATING;
this.taskName = taskName;
- this.timings = null; // Will be changed in later patch
+ this.timings = MinecraftTimings.getInternalTaskName(taskName);
}
// Paper end
@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
}
this.id = id;
@@ -2008,8 +1989,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
return CraftNamespacedKey.toMinecraft(mat.getKey());
}
// Paper end
// ========================================================================
+ // Paper start
+ @Override