diff --git a/patches/api/0003-Final-timings-calls.patch b/patches/api/0003-Final-timings-calls.patch new file mode 100644 index 0000000..66282ce --- /dev/null +++ b/patches/api/0003-Final-timings-calls.patch @@ -0,0 +1,91 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Sat, 24 Dec 2022 22:37:29 +0100 +Subject: [PATCH] Final timings calls + +License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) +Gale - https://galemc.org + +diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java +index 43b85ce3a6c27a2f92c67d62bee7484c2652b72a..bbc73f3591afe29de429e7e7d693a536616e8dbc 100644 +--- a/src/main/java/co/aikar/timings/FullServerTickHandler.java ++++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java +@@ -18,8 +18,7 @@ public class FullServerTickHandler extends TimingHandler { + } + + @NotNull +- @Override +- public Timing startTiming() { ++ public Timing startTimingFullServerTick() { // Gale - final timings calls + if (TimingsManager.needsFullReset) { + TimingsManager.resetTimings(); + } else if (TimingsManager.needsRecheckEnabled) { +@@ -28,8 +27,7 @@ public class FullServerTickHandler extends TimingHandler { + return super.startTiming(); + } + +- @Override +- public void stopTiming() { ++ public void stopTimingFullServerTick() { // Gale - final timings calls + super.stopTiming(); + if (!isEnabled()) { + return; +diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java +index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..51d54b87106aa17c2de9ab22eae22d176c7d0bfc 100644 +--- a/src/main/java/co/aikar/timings/TimingHandler.java ++++ b/src/main/java/co/aikar/timings/TimingHandler.java +@@ -97,7 +97,7 @@ class TimingHandler implements Timing { + } + + @NotNull +- public Timing startTiming() { ++ public final Timing startTiming() { // Gale - final timings calls + if (!enabled || !Bukkit.isPrimaryThread()) { + return this; + } +@@ -109,7 +109,7 @@ class TimingHandler implements Timing { + return this; + } + +- public void stopTiming() { ++ public final void stopTiming() { // Gale - final timings calls + if (!enabled || timingDepth <= 0 || start == 0 || !Bukkit.isPrimaryThread()) { + return; + } +diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java +index 632c4961515f5052551f841cfa840e60bba7a257..49180ea7879c64af3cd5143a34783d564746b504 100644 +--- a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java ++++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java +@@ -23,31 +23,4 @@ + */ + package co.aikar.timings; + +-import org.bukkit.Bukkit; +-import org.jetbrains.annotations.NotNull; +- +-class UnsafeTimingHandler extends TimingHandler { +- +- UnsafeTimingHandler(@NotNull TimingIdentifier id) { +- super(id); +- } +- +- private static void checkThread() { +- if (!Bukkit.isPrimaryThread()) { +- throw new IllegalStateException("Calling Timings from Async Operation"); +- } +- } +- +- @NotNull +- @Override +- public Timing startTiming() { +- checkThread(); +- return super.startTiming(); +- } +- +- @Override +- public void stopTiming() { +- checkThread(); +- super.stopTiming(); +- } +-} ++class UnsafeTimingHandler {} // Gale - final timings calls diff --git a/patches/api/0003-SIMD-support.patch b/patches/api/0004-SIMD-support.patch similarity index 97% rename from patches/api/0003-SIMD-support.patch rename to patches/api/0004-SIMD-support.patch index 87f7f19..4718a72 100644 --- a/patches/api/0003-SIMD-support.patch +++ b/patches/api/0004-SIMD-support.patch @@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/build.gradle.kts b/build.gradle.kts -index fdb495c0e0f1ce702a590e6a7bcdcf40fd418d1c..2c3c8fbba6247a44b1782dbed45a00fdaa051473 100644 +index 447b549bc7035410ae18f3e9063de2d014530b98..33e7179c81310283e5e6efb5fd776a60ae669624 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -89,6 +89,7 @@ tasks.withType { diff --git a/patches/api/0004-Vectorized-map-color-conversion.patch b/patches/api/0005-Vectorized-map-color-conversion.patch similarity index 100% rename from patches/api/0004-Vectorized-map-color-conversion.patch rename to patches/api/0005-Vectorized-map-color-conversion.patch diff --git a/patches/api/0005-Skip-events-without-listeners.patch b/patches/api/0006-Skip-events-without-listeners.patch similarity index 100% rename from patches/api/0005-Skip-events-without-listeners.patch rename to patches/api/0006-Skip-events-without-listeners.patch diff --git a/patches/api/0006-Player-canSee-by-entity-UUID.patch b/patches/api/0007-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/api/0006-Player-canSee-by-entity-UUID.patch rename to patches/api/0007-Player-canSee-by-entity-UUID.patch diff --git a/patches/api/0007-Specific-interval-TPS-API.patch b/patches/api/0008-Specific-interval-TPS-API.patch similarity index 100% rename from patches/api/0007-Specific-interval-TPS-API.patch rename to patches/api/0008-Specific-interval-TPS-API.patch diff --git a/patches/api/0008-5-second-TPS-average.patch b/patches/api/0009-5-second-TPS-average.patch similarity index 100% rename from patches/api/0008-5-second-TPS-average.patch rename to patches/api/0009-5-second-TPS-average.patch diff --git a/patches/api/0009-Last-tick-time-API.patch b/patches/api/0010-Last-tick-time-API.patch similarity index 100% rename from patches/api/0009-Last-tick-time-API.patch rename to patches/api/0010-Last-tick-time-API.patch