diff options
Diffstat (limited to 'patches/api/0010-Timings-v2.patch')
| -rw-r--r-- | patches/api/0010-Timings-v2.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch index 3b68a66eec..a5760e7af6 100644 --- a/patches/api/0010-Timings-v2.patch +++ b/patches/api/0010-Timings-v2.patch @@ -717,10 +717,10 @@ index 0000000000000000000000000000000000000000..199789d56d22fcb1b77ebd56805cc28a +} diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java new file mode 100644 -index 0000000000000000000000000000000000000000..0a0e6308923f466ca96786b74811b9beeca83d73 +index 0000000000000000000000000000000000000000..7213bd2ccf6fa03933a9dff878baee8e92bf50b9 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistory.java -@@ -0,0 +1,358 @@ +@@ -0,0 +1,356 @@ +/* + * This file is licensed under the MIT License (MIT). + * @@ -749,7 +749,6 @@ index 0000000000000000000000000000000000000000..0a0e6308923f466ca96786b74811b9be +import co.aikar.timings.TimingHistory.RegionData.RegionId; +import com.google.common.base.Function; +import com.google.common.collect.Sets; -+ +import org.bukkit.Bukkit; +import org.bukkit.Chunk; +import org.bukkit.World; @@ -768,7 +767,6 @@ index 0000000000000000000000000000000000000000..0a0e6308923f466ca96786b74811b9be +import java.util.Locale; +import java.util.Map; +import java.util.Set; -+ +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + @@ -871,7 +869,7 @@ index 0000000000000000000000000000000000000000..0a0e6308923f466ca96786b74811b9be + public JSONPair apply(Map.Entry<EntityType, Counter> entry) { + entityTypeSet.add(entry.getKey()); + return pair( -+ entry.getKey().getKey().getKey().toUpperCase(Locale.ROOT), ++ entry.getKey().getKey().getKey().toUpperCase(Locale.ENGLISH), + entry.getValue().count() + ); + } @@ -884,7 +882,7 @@ index 0000000000000000000000000000000000000000..0a0e6308923f466ca96786b74811b9be + public JSONPair apply(Map.Entry<BlockType, Counter> entry) { + tileEntityTypeSet.add(entry.getKey()); + return pair( -+ entry.getKey().getKey().getKey().toUpperCase(Locale.ROOT), ++ entry.getKey().getKey().getKey().toUpperCase(Locale.ENGLISH), + entry.getValue().count() + ); + } @@ -2857,7 +2855,7 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c0ba2c8d47bd6f149410b57e45fc87a3b3ad4aab..51b5ac9d535d1ecac7719deed2e422db442a1171 100644 +index 208825df2752c10caf2cf8fb860d5b25bdd429b2..e2f7f9ebed56f5d4ca23dafe313263b386121391 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -833,7 +833,6 @@ public final class Bukkit { @@ -2869,7 +2867,7 @@ index c0ba2c8d47bd6f149410b57e45fc87a3b3ad4aab..51b5ac9d535d1ecac7719deed2e422db /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 437d59ddf6a6859afc052257ba3f574929071522..c8a8305e41a55e98c99ed9df07f5763071a4485f 100644 +index 7aacf5c174dc66df0f605236ace5bcd2c5689a3b..520cbdb2cc7da4550e9346ebdfea0e80f32a49b6 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1819,6 +1819,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi |