Skip to content

Commit 22ac7d6

Browse files
committed
Add internal netty pipeline events
1 parent b327e17 commit 22ac7d6

File tree

3 files changed

+40
-4
lines changed

3 files changed

+40
-4
lines changed

patches/server/0632-Add-Channel-initialization-listeners.patch

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,42 @@ index 0000000000000000000000000000000000000000..30e62719e0a83525daa33cf41cb61df3
105105
+ }
106106
+ }
107107
+}
108+
diff --git a/src/main/java/io/papermc/paper/network/ConnectionEvent.java b/src/main/java/io/papermc/paper/network/ConnectionEvent.java
109+
new file mode 100644
110+
index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4f41ab83a
111+
--- /dev/null
112+
+++ b/src/main/java/io/papermc/paper/network/ConnectionEvent.java
113+
@@ -0,0 +1,10 @@
114+
+package io.papermc.paper.network;
115+
+
116+
+/**
117+
+ * Internal connection pipeline events.
118+
+ */
119+
+public enum ConnectionEvent {
120+
+
121+
+ COMPRESSION_THRESHOLD_SET,
122+
+ COMPRESSION_DISABLED
123+
+}
124+
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
125+
index 91556b52edaa1d5c4dc73a825c77b9a66b002c61..91cf0a6b5061bf4731731fdd69beb80fb30c6b51 100644
126+
--- a/src/main/java/net/minecraft/network/Connection.java
127+
+++ b/src/main/java/net/minecraft/network/Connection.java
128+
@@ -555,6 +555,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
129+
} else {
130+
this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
131+
}
132+
+ this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper
133+
} else {
134+
if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
135+
this.channel.pipeline().remove("decompress");
136+
@@ -563,6 +564,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
137+
if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
138+
this.channel.pipeline().remove("compress");
139+
}
140+
+ this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_DISABLED); // Paper
141+
}
142+
143+
}
108144
diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
109145
index 72fbc58f7d003b7af3c35e5fc504010307c7086b..076c1d5fb69a4a30b3e412e85b17db09fd9a1def 100644
110146
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java

patches/server/0650-Add-Unix-domain-socket-support.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
1111
Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
1212

1313
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
14-
index 91556b52edaa1d5c4dc73a825c77b9a66b002c61..00abdd5bba02b7cdf8dbdc423594f0fde890dd84 100644
14+
index 91cf0a6b5061bf4731731fdd69beb80fb30c6b51..45598a94524519257c5ffb03800f0b081f4d7a78 100644
1515
--- a/src/main/java/net/minecraft/network/Connection.java
1616
+++ b/src/main/java/net/minecraft/network/Connection.java
17-
@@ -627,6 +627,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
17+
@@ -629,6 +629,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
1818
// Spigot Start
1919
public SocketAddress getRawAddress()
2020
{

patches/server/0763-Use-Velocity-compression-and-cipher-natives.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ index 792883afe53d2b7989c25a81c2f9a639d5e21d20..c04379ca8a4db0f4de46ad2b3b338431
268268
return this.threshold;
269269
}
270270
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
271-
index 7e2256ac88e874b34b6a0c638bfced368ba29be2..9549e8ed4b245176b340ab2f22f4bdefdbe28a9e 100644
271+
index e0a29625d17d315b2f614c65a0a82c6d1a82676d..f018d07cbea3785876a547da158cf60eb831a5fb 100644
272272
--- a/src/main/java/net/minecraft/network/Connection.java
273273
+++ b/src/main/java/net/minecraft/network/Connection.java
274274
@@ -641,11 +641,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -322,8 +322,8 @@ index 7e2256ac88e874b34b6a0c638bfced368ba29be2..9549e8ed4b245176b340ab2f22f4bdef
322322
- this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
323323
+ this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressor, compressionThreshold)); // Paper
324324
}
325+
this.channel.pipeline().fireUserEventTriggered(io.papermc.paper.network.ConnectionEvent.COMPRESSION_THRESHOLD_SET); // Paper
325326
} else {
326-
if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
327327
diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
328328
index 9e7154c9df96d5a0577886d43a98a73626a8f189..af3e70920221b6bd127bb3aed7f1e0a7e9e4c322 100644
329329
--- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java

0 commit comments

Comments
 (0)