13
0
geforkt von Mirrors/Paper

add 1 more networking patch and add comments to dropped patches

Dieser Commit ist enthalten in:
Jake Potrebic 2023-06-08 10:25:32 -07:00
Ursprung e516ecfd45
Commit f3124c37c5

Datei anzeigen

@ -23,15 +23,6 @@ diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/Connection.java --- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -0,0 +0,0 @@ import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
+
+import io.netty.util.concurrent.AbstractEventExecutor; // Paper
public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
private static final float AVERAGE_PACKETS_SMOOTHING = 0.75F;
@@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> { @@ -0,0 +0,0 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
if (this.channel.eventLoop().inEventLoop()) { if (this.channel.eventLoop().inEventLoop()) {
this.doSendPacket(packet, callbacks, enumprotocol, enumprotocol1, flush); // Paper this.doSendPacket(packet, callbacks, enumprotocol, enumprotocol1, flush); // Paper
@ -40,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // note: since the type is not dynamic here, we need to actually copy the old executor code + // note: since the type is not dynamic here, we need to actually copy the old executor code
+ // into two branches. On conflict, just re-copy - no changes were made inside the executor code. + // into two branches. On conflict, just re-copy - no changes were made inside the executor code.
+ if (!flush) { + if (!flush) {
+ AbstractEventExecutor.LazyRunnable run = () -> { + io.netty.util.concurrent.AbstractEventExecutor.LazyRunnable run = () -> {
+ this.doSendPacket(packet, callbacks, enumprotocol, enumprotocol1, flush); // Paper - add flush parameter + this.doSendPacket(packet, callbacks, enumprotocol, enumprotocol1, flush); // Paper - add flush parameter
+ }; + };
+ this.channel.eventLoop().execute(run); + this.channel.eventLoop().execute(run);