merge some patches & re-enable timings

2026-02-21 10:27:44 +01:00 · 2021-08-20 17:41:02 -04:00
parent d918b4f0c6
commit 6e1ad89162
54 changed files with 75 additions and 64 deletions
--- a/patches/server/0006-Purpur-client-support.patch
+++ b/patches/server/0006-Purpur-client-support.patch
@@ -42,3 +42,19 @@ index 162a4b3b3312867a64425caa0d6ec6af157b20e1..f99d06e53856c14f5b94c28d379b8188
         } else {
             try {
                 byte[] data = new byte[packet.data.readableBytes()];
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index b2c6d1611422a3900e5c9d4b1983cc74dd820973..03ac2878f54ca994b5faf28fa68aa547bd7388c3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2549,4 +2549,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         return this.spigot;
+     }
+     // Spigot end
+
+    // Purpur start
+    @Override
+    public boolean usesPurpurClient() {
+        return getHandle().purpurClient;
+    }
+    // Purpur end
+ }