core/testserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix issue in last build with null task timings

Browse source
This commit is contained in:
Aikar 2019-03-26 01:31:59 -04:00
parent e055103d3d
commit 4d3f9e2033
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
2 changed files with 19 additions and 15 deletions
Spigot-API-Patches
0004-Timings-v2.patch
Spigot-Server-Patches
0009-Timings-v2.patch

7
Spigot-API-Patches/0004-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 7a646006087774fb9c2558e741c74f3e3e0a6819 Mon Sep 17 00:00:00 2001 From ebbed0af5ea59a842060fc3ea64c761bf647c944 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600 Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -96,10 +96,10 @@ index 000000000..64531fcce
+} +}
diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
new file mode 100644 new file mode 100644
index 000000000..8e0cd40e8 index 000000000..9b45ce887
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +1,67 @@ @@ -0,0 +1,68 @@
+/* +/*
+ * This file is licensed under the MIT License (MIT). + * This file is licensed under the MIT License (MIT).
+ * + *
@ -129,6 +129,7 @@ index 000000000..8e0cd40e8
+import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.Nullable;
+ +
+public final class NullTimingHandler implements Timing { +public final class NullTimingHandler implements Timing {
+ public static final Timing NULL = new NullTimingHandler();
+ @NotNull + @NotNull
+ @Override + @Override
+ public Timing startTiming() { + public Timing startTiming() {

27
Spigot-Server-Patches/0009-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From f2743e61a346316b3627c75f8d6beb3c30a8cd75 Mon Sep 17 00:00:00 2001 From b2b00bd52cd8c46f44492517c2455e3e5ea22e43 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600 Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -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 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
new file mode 100644 new file mode 100644
index 000000000..66d02e048 index 000000000..7a2a27cdb
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,132 @@ @@ -0,0 +1,132 @@
@ -63,7 +63,7 @@ index 000000000..66d02e048
+ */ + */
+ public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) { + public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) {
+ if (!bukkitTask.isSync()) { + if (!bukkitTask.isSync()) {
+ return null; + return NullTimingHandler.NULL;
+ } + }
+ Plugin plugin; + Plugin plugin;
+ +
@ -1653,12 +1653,15 @@ index 646128f16..d75cc42e1 100644
private boolean isReady(final int currentTick) { 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 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 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.scheduler; @@ -1,9 +1,11 @@
package org.bukkit.craftbukkit.scheduler;
import java.util.function.Consumer; import java.util.function.Consumer;
+
+import co.aikar.timings.NullTimingHandler;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot -import org.bukkit.craftbukkit.SpigotTimings; // Spigot
-import org.spigotmc.CustomTimingsHandler; // Spigot -import org.spigotmc.CustomTimingsHandler; // Spigot
@ -1667,7 +1670,7 @@ index 3f55381c1..17ba052f8 100644
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
@@ -26,12 +26,12 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -26,12 +28,12 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
*/ */
private volatile long period; private volatile long period;
private long nextRun; private long nextRun;
@ -1683,7 +1686,7 @@ index 3f55381c1..17ba052f8 100644
CraftTask() { CraftTask() {
this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING); this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
} }
@@ -40,7 +40,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -40,7 +42,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this(null, task, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING); this(null, task, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
} }
@ -1692,16 +1695,16 @@ index 3f55381c1..17ba052f8 100644
this.plugin = plugin; this.plugin = plugin;
if (task instanceof Runnable) { if (task instanceof Runnable) {
this.rTask = (Runnable) task; this.rTask = (Runnable) task;
@@ -57,7 +57,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -57,7 +59,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
} }
this.id = id; this.id = id;
this.period = period; this.period = period;
- this.timings = this.isSync() ? SpigotTimings.getPluginTaskTimings(this, period) : null; // Spigot - 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 @Override
@@ -77,11 +77,13 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -77,11 +79,13 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
@Override @Override
public void run() { public void run() {
@ -1715,7 +1718,7 @@ index 3f55381c1..17ba052f8 100644
} }
long getPeriod() { long getPeriod() {
@@ -108,7 +110,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -108,7 +112,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this.next = next; this.next = next;
} }
@ -1724,7 +1727,7 @@ index 3f55381c1..17ba052f8 100644
return (rTask != null) ? rTask.getClass() : ((cTask != null) ? cTask.getClass() : null); return (rTask != null) ? rTask.getClass() : ((cTask != null) ? cTask.getClass() : null);
} }
@@ -132,9 +134,4 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -132,9 +136,4 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
return true; return true;
} }