Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-30 07:27:28 +02:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source
This commit is contained in:
LinsaFTW 2023-03-31 09:38:03 -03:00
parent 04a0f02784
commit 69e82d0783
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 0dc74bb24213c9e08dc78d9f3c53089b3b52118b
Subproject commit fb7c7395669840cdfc6d7bc34bc24ead466091ec

12
Waterfall-Proxy-Patches/0010-Close-connections-Don-t-flush-if-not-necessary.patch
View File

@ -1,4 +1,4 @@
From 3fcd08a5340657c1144a5d9a2c919c2297937589 Mon Sep 17 00:00:00 2001
From e801d03bfaa70492f0ad246397b0875c8fec9668 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:06:17 +0800
Subject: [PATCH] Close connections & Don't flush if not necessary
@ -86,18 +86,18 @@ index 6dc5633f..8b0fac0a 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index af65e192..993b55b0 100644
index 6a045d16..9227db06 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -5,6 +5,7 @@ import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
import io.netty.buffer.PooledByteBufAllocator;
@@ -6,6 +6,7 @@ import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
@@ -101,6 +102,14 @@ public class PipelineUtils
@@ -102,6 +103,14 @@ public class PipelineUtils
BungeeCord.getInstance().getPluginManager().callEvent(connectionInitEvent);
}
@ -112,7 +112,7 @@ index af65e192..993b55b0 100644
};
public static final Base BASE = new Base( false );
public static final Base BASE_SERVERSIDE = new Base( true );
@@ -203,5 +212,13 @@ public class PipelineUtils
@@ -244,5 +253,13 @@ public class PipelineUtils
ch.pipeline().addLast( BOSS_HANDLER, new HandlerBoss() );
}

6
Waterfall-Proxy-Patches/0027-TCP-Fast-Open.patch
View File

@ -1,4 +1,4 @@
From 7967c49c7a8e56c79de7d520f9ae03f2ed53af1e Mon Sep 17 00:00:00 2001
From ac1ea510e73bdc4f02d4d73919edabd1313bc5ff Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 24 Feb 2022 23:41:57 -0300
Subject: [PATCH] TCP Fast Open
@ -29,10 +29,10 @@ index b41ee92c..14665b1f 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index d9e360a1..156ea2aa 100644
index f9227e01..1a5a0e08 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -203,6 +203,8 @@ public class PipelineUtils
@@ -244,6 +244,8 @@ public class PipelineUtils
// IP_TOS is not supported (Windows XP / Windows Server 2003)
}
ch.config().setOption( ChannelOption.TCP_NODELAY, true );

8
Waterfall-Proxy-Patches/0028-Antibot-System.patch
View File

@ -1,4 +1,4 @@
From 87645acfa86b4bd64b98b3a6aef7e9727fb1f24c Mon Sep 17 00:00:00 2001
From 4cf1d03c88fcca0a11057eed5ca57581ad9cc618 Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 4 Mar 2022 13:35:53 -0300
Subject: [PATCH] Antibot System
@ -1708,7 +1708,7 @@ index fb81adee..173b47f3 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index c0a50444..08aa4318 100644
index 51da85ac..998445a7 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -533,6 +533,11 @@ public class BungeeCord extends ProxyServer
@ -1962,10 +1962,10 @@ index 14e3004f..b61ed521 100644
{
boolean logExceptions = !( handler instanceof PingHandler );
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 156ea2aa..3a025312 100644
index 1a5a0e08..f32a3747 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -62,6 +62,20 @@ public class PipelineUtils
@@ -63,6 +63,20 @@ public class PipelineUtils
{
SocketAddress remoteAddress = ( ch.remoteAddress() == null ) ? ch.parent().localAddress() : ch.remoteAddress();

8
Waterfall-Proxy-Patches/0040-Implement-libdeflate.patch
View File

@ -1,4 +1,4 @@
From 482102b6fca099a58b23ed16997e4d8f0b063da3 Mon Sep 17 00:00:00 2001
From 3aae0780d014478a4ad684b382bd2185ff9cfe8c Mon Sep 17 00:00:00 2001
From: xIsm4 <soportexism4@gmail.com>
Date: Fri, 27 Jan 2023 14:12:44 +0100
Subject: [PATCH] Implement libdeflate
@ -2118,7 +2118,7 @@ index 02625018..37abc9f7 100644
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-module-cmd-alert</artifactId>
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 27ca8755..a6b2c94e 100644
index 76f77a53..ddf80d6c 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -17,6 +17,7 @@ import dev._2lstudios.flamecord.commands.FlameCordCommand;
@ -2451,10 +2451,10 @@ index b98ee6a7..ffe03816 100644
// Make the channel accessible
public Channel getChannel() {
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 3a025312..5833b668 100644
index f32a3747..19f0f076 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -130,7 +130,7 @@ public class PipelineUtils
@@ -131,7 +131,7 @@ public class PipelineUtils
public static final Base BASE = new Base( false );
public static final Base BASE_SERVERSIDE = new Base( true );
private static final KickStringWriter legacyKicker = new KickStringWriter();

11
Waterfall-Proxy-Patches/0043-Optimize-PipelineUtils.patch
View File

@ -1,19 +1,20 @@
From 0604d2c10875114e158a82a67cf7ac743c6c1e20 Mon Sep 17 00:00:00 2001
From d3cfbc8aaa6a2d7080b45732ad6912595bc13f5f Mon Sep 17 00:00:00 2001
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
Date: Thu, 23 Mar 2023 22:35:42 -0300
Subject: [PATCH] Optimize PipelineUtils
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 5833b668..28223ec8 100644
index 19f0f076..f292db94 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -6,10 +6,12 @@ import dev._2lstudios.flamecord.FlameCord;
@@ -6,11 +6,13 @@ import dev._2lstudios.flamecord.FlameCord;
import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
import io.netty.channel.ChannelException;
import io.netty.channel.ChannelFactory;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
@ -21,7 +22,7 @@ index 5833b668..28223ec8 100644
import io.netty.channel.EventLoopGroup;
import io.netty.channel.ServerChannel;
import io.netty.channel.WriteBufferWaterMark;
@@ -53,7 +55,6 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
@@ -54,7 +56,6 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
public class PipelineUtils
{
@ -29,7 +30,7 @@ index 5833b668..28223ec8 100644
public static final AttributeKey<ListenerInfo> LISTENER = AttributeKey.newInstance( "ListerInfo" );
public static final ChannelInitializer<Channel> SERVER_CHILD = new ChannelInitializer<Channel>()
{
@@ -209,26 +210,30 @@ public class PipelineUtils
@@ -250,26 +251,30 @@ public class PipelineUtils
@Override
public void initChannel(Channel ch) throws Exception
{