mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 16:50:17 +01:00
bc127ea819
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent 205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron CraftBukkit Changes: b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket 4f34a67b #891: Fix scheduler task ID overflow and duplication issues Spigot Changes: d03d7f12 BUILDTOOLS-604: Rebuild patches
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 11 Mar 2018 14:13:33 -0400
|
|
Subject: [PATCH] Disable Explicit Network Manager Flushing
|
|
|
|
This seems completely pointless, as packet dispatch uses .writeAndFlush.
|
|
|
|
Things seem to work fine without explicit flushing, but incase issues arise,
|
|
provide a System property to re-enable it using improved logic of doing the
|
|
flushing on the netty event loop, so it won't do the flush on the main thread.
|
|
|
|
Renable flushing by passing -Dpaper.explicit-flush=true
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
|
|
index 06e965996a5c50bce617847e594ae0dd83403484..636ac646bec67dbd933f00614693af03481b6173 100644
|
|
--- a/src/main/java/net/minecraft/network/Connection.java
|
|
+++ b/src/main/java/net/minecraft/network/Connection.java
|
|
@@ -86,6 +86,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
|
// Paper start - NetworkClient implementation
|
|
public int protocolVersion;
|
|
public java.net.InetSocketAddress virtualHost;
|
|
+ private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
|
|
// Paper end
|
|
|
|
public Connection(PacketFlow side) {
|
|
@@ -259,7 +260,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
|
}
|
|
|
|
if (this.channel != null) {
|
|
- this.channel.flush();
|
|
+ if (enableExplicitFlush) this.channel.eventLoop().execute(() -> this.channel.flush()); // Paper - we don't need to explicit flush here, but allow opt in incase issues are found to a better version
|
|
}
|
|
|
|
if (this.tickCount++ % 20 == 0) {
|