2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								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
  
						 
					
						
							
								
									
										
										
										
											2023-03-14 19:59:51 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								index 07b2d28c5cba543b104ade6a180b0940a794e08c..b1a9c75081f7e61212ea9395b35375e067fd7fc6 100644
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								--- a/src/main/java/net/minecraft/network/Connection.java
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								+++ b/src/main/java/net/minecraft/network/Connection.java
  
						 
					
						
							
								
									
										
										
										
											2023-03-14 19:59:51 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -117,6 +117,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								     // 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) {
							 
						 
					
						
							
								
									
										
										
										
											2023-03-14 19:59:51 +01:00 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								@@ -317,7 +318,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
						 
					
						
							
								
									
										
										
										
											2021-06-11 14:02:28 +02:00 
										
									 
								 
							 
							
								
							 
							
								 
							
							
								         }
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								 
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								         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) {