mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 07:20:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
da126a405e
Paper/Spigot-Server-Patches/0241-Disable-Explicit-Network-Manager-Flushing.patch

38 lines
1.7 KiB
Diff
Raw Normal View History

[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types
2018-08-06 07:46:43 +08:00
From 1e1413f50f5a67afcf8a7a2d53f85af1b349aa32 Mon Sep 17 00:00:00 2001
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
From: Aikar <aikar@aikar.co>
Date: Sun, 11 Mar 2018 14:13:33 -0400
explicit, not implicit... oops
2018-03-12 02:21:03 +08:00
Subject: [PATCH] Disable Explicit Network Manager Flushing
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
This seems completely pointless, as packet dispatch uses .writeAndFlush.
explicit, not implicit... oops
2018-03-12 02:21:03 +08:00
Things seem to work fine without explicit flushing, but incase issues arise,
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
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.
explicit, not implicit... oops
2018-03-12 02:21:03 +08:00
Renable flushing by passing -Dpaper.explicit-flush=true
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
Update B/CB/S
2018-07-23 16:39:55 +08:00
index 61f9eb3e64..2272f1239b 100644
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-19 02:55:52 +08:00
@@ -66,6 +66,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
// Paper start - NetworkClient implementation
public int protocolVersion;
public java.net.InetSocketAddress virtualHost;
explicit, not implicit... oops
2018-03-12 02:21:03 +08:00
+ private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush");
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
// Paper end
public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-19 02:55:52 +08:00
@@ -236,7 +237,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
}
if (this.channel != null) {
- this.channel.flush();
explicit, not implicit... oops
2018-03-12 02:21:03 +08:00
+ 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
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
}
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-19 02:55:52 +08:00
if (this.u++ % 20 == 0) {
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
--
Fix issues with getBlockState(false) not loading Tile Entity data This only impacted people who used our useSnapshots new API in a plugin, which obviously was no one as the data result was completely broken. Merged the NPE check patch into mine since it has to handle it too.
2018-06-30 13:40:52 +08:00
2.18.0
Disable Implicit Network Manager Flushing This seems completely pointless, as packet dispatch uses .writeAndFlush. Things seem to work fine without implicit 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.implicit-flush=true
2018-03-12 02:15:38 +08:00
Reference in New Issue Copy Permalink