diff options
| author | Mariell <[email protected]> | 2020-09-12 21:57:21 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-12 15:57:21 -0400 |
| commit | a0b8b886c894e14db15c6ab720d2831f83b2a848 (patch) | |
| tree | e7563a99f7744ec9e65a4fe56305479e9cc0e479 /Spigot-Server-Patches/0009-Timings-v2.patch | |
| parent | fb71c71c80842beb3cbe3e5da1b5615edfade2c5 (diff) | |
| download | Paper-a0b8b886c894e14db15c6ab720d2831f83b2a848.tar.gz Paper-a0b8b886c894e14db15c6ab720d2831f83b2a848.zip | |
Updated Upstream (CraftBukkit/Spigot) (#4318)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+
Spigot Changes:
2740d5ae Rebuild patches
Diffstat (limited to 'Spigot-Server-Patches/0009-Timings-v2.patch')
| -rw-r--r-- | Spigot-Server-Patches/0009-Timings-v2.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 884e75ee56..0f0778c0e8 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -923,19 +923,21 @@ index 11891990d90b789192d9081787c1e844646121ae..2a48d85f0490991eb323ef550cb6148d int k = 0; CustomFunction.c[] acustomfunction_c = customfunction.b(); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f04c819d3a 100644 +index 468d0cce2208bc21ec3d62590ac6e050a2037518..b5d1dbf889138699c877f13382557ce377e70e72 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -28,7 +28,7 @@ import org.apache.logging.log4j.Level; - +@@ -26,8 +26,9 @@ import org.apache.logging.log4j.Logger; + import org.apache.logging.log4j.Level; + import org.apache.logging.log4j.io.IoBuilder; import org.bukkit.command.CommandSender; - import org.bukkit.craftbukkit.LoggerOutputStream; -import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import co.aikar.timings.MinecraftTimings; // Paper import org.bukkit.event.server.ServerCommandEvent; - import org.bukkit.craftbukkit.util.Waitable; ++import org.bukkit.craftbukkit.util.Waitable; import org.bukkit.event.server.RemoteServerCommandEvent; -@@ -379,7 +379,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer + // CraftBukkit end + +@@ -376,7 +377,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } public void handleCommandQueue() { @@ -944,7 +946,7 @@ index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f0 while (!this.serverCommandQueue.isEmpty()) { ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0); -@@ -394,7 +394,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -391,7 +392,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer // CraftBukkit end } @@ -953,7 +955,7 @@ index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f0 } @Override -@@ -630,6 +630,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -627,6 +628,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @Override public String executeRemoteCommand(String s) { @@ -961,7 +963,7 @@ index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f0 this.remoteControlCommandListener.clearMessages(); this.executeSync(() -> { // CraftBukkit start - fire RemoteServerCommandEvent -@@ -638,10 +639,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer +@@ -635,10 +637,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer if (event.isCancelled()) { return; } @@ -1457,7 +1459,7 @@ index 127c03c321e1414e0d174c8d81a7851c9da03574..d98b6ef44e1836920956754dfcb6654f protected void broadcast(Entity entity, Packet<?> packet) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5..89c36a5ad2a74a2bf4c86ad108a43e97fa88e793 100644 +index c455d0b2dc806d7c26235e6c89c58311548177ec..fd1860e3a83dec60362997ac6e1225270260cf38 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory; |