mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-22 04:33:28 +01:00
Fix issue in last build with null task timings
This commit is contained in:
parent
92059ef6ba
commit
8c452eb0d5
2 changed files with 10 additions and 6 deletions
|
@ -96,7 +96,7 @@ index 000000000..64531fcce
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
|
||||
new file mode 100644
|
||||
index 000000000..8e0cd40e8
|
||||
index 000000000..9b45ce887
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -129,6 +129,7 @@ index 000000000..8e0cd40e8
|
|||
+import org.jetbrains.annotations.Nullable;
|
||||
+
|
||||
+public final class NullTimingHandler implements Timing {
|
||||
+ public static final Timing NULL = new NullTimingHandler();
|
||||
+ @NotNull
|
||||
+ @Override
|
||||
+ public Timing startTiming() {
|
||||
|
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
|
|||
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
new file mode 100644
|
||||
index 000000000..66d02e048
|
||||
index 000000000..7a2a27cdb
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -63,7 +63,7 @@ index 000000000..66d02e048
|
|||
+ */
|
||||
+ public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) {
|
||||
+ if (!bukkitTask.isSync()) {
|
||||
+ return null;
|
||||
+ return NullTimingHandler.NULL;
|
||||
+ }
|
||||
+ Plugin plugin;
|
||||
+
|
||||
|
@ -1653,12 +1653,15 @@ index 646128f16..d75cc42e1 100644
|
|||
|
||||
private boolean isReady(final int currentTick) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
index 3f55381c1..17ba052f8 100644
|
||||
index 3f55381c1..0d9a46680 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
@@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.scheduler;
|
||||
@@ -0,0 +0,0 @@
|
||||
package org.bukkit.craftbukkit.scheduler;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
+
|
||||
+import co.aikar.timings.NullTimingHandler;
|
||||
import org.bukkit.Bukkit;
|
||||
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
|
||||
-import org.spigotmc.CustomTimingsHandler; // Spigot
|
||||
|
@ -1697,7 +1700,7 @@ index 3f55381c1..17ba052f8 100644
|
|||
this.id = id;
|
||||
this.period = period;
|
||||
- this.timings = this.isSync() ? SpigotTimings.getPluginTaskTimings(this, period) : null; // Spigot
|
||||
+ timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : null; // Paper
|
||||
+ timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Add table
Reference in a new issue