Updated Upstream (CraftBukkit/Spigot) (#5169)

This commit is contained in:
Mariell Hoversholm
2021-02-05 23:52:27 +01:00
parent c07b432618
commit 0677694e78
12 changed files with 18 additions and 61 deletions

View File

@@ -1921,7 +1921,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
-
- String name = "Task: " + plugin + " Runnable: " + taskname;
- if (period > 0) {
- name += "(interval:" + period +")";
- name += "(interval:" + period + ")";
- } else {
- name += "(Single)";
- }
@@ -2120,12 +2120,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+import co.aikar.timings.NullTimingHandler;
import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
-import org.spigotmc.CustomTimingsHandler; // Spigot
+import co.aikar.timings.MinecraftTimings; // Paper
+import co.aikar.timings.Timing; // Paper
import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.spigotmc.CustomTimingsHandler; // Spigot
@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
*/