Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-06 02:31:46 +01:00
Code Issues Projects Releases Wiki Activity

checks improvements

Browse Source
This commit is contained in:
LinsaFTW 2021-10-07 00:06:05 -03:00
parent 3b32aa56fd
commit fdc5e527ec
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Waterfall-Proxy-Patches/0011-Packet-Checks.patch
View File

@ -1,4 +1,4 @@
From 32f56cb02f7336ed609e181e5bb582fa5a9d0d79 Mon Sep 17 00:00:00 2001
From 295841ad76a439554074bfde7813de1a487d20a5 Mon Sep 17 00:00:00 2001
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
Date: Wed, 16 Dec 2020 18:10:30 +0800
Subject: [PATCH] Packet Checks
@ -29,15 +29,19 @@ index 01d35f41a..ec07ae6fd 100644
Object packetTypeInfo = null;
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index f8d6becd6..c0e4791f9 100644
index f8d6becd6..336050075 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -78,6 +78,11 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -78,6 +78,15 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
{
+ // FlameCord - Return if channel isn't active
+ if (!ctx.channel().isActive()) {
+ if (msg instanceof PacketWrapper) {
+ ((PacketWrapper) msg).trySingleRelease();
+ }
+
+ return;
+ }
+

8
Waterfall-Proxy-Patches/0026-FlameCord-logger-options.patch
View File

@ -1,4 +1,4 @@
From 1e753a003c6e30aeb86d841d6076e7a1ddd6f755 Mon Sep 17 00:00:00 2001
From ac00cd8c9705f60f9dfbf763241c1e1fd436574a Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 23:51:51 -0300
Subject: [PATCH] FlameCord logger options
@ -62,7 +62,7 @@ index 8f142f488..5fd105410 100644
bungee.getLogger().log( Level.INFO, "{0} has connected", this );
}
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index 8d6f9d3ae..e5602230a 100644
index 224146868..fbc19f66b 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -47,7 +47,8 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@ -85,7 +85,7 @@ index 8d6f9d3ae..e5602230a 100644
{
ProxyServer.getInstance().getLogger().log( Level.INFO, "{0} has disconnected", handler );
}
@@ -95,10 +97,12 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -99,10 +101,12 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
{
InetSocketAddress newAddress = new InetSocketAddress( proxy.sourceAddress(), proxy.sourcePort() );
@ -102,7 +102,7 @@ index 8d6f9d3ae..e5602230a 100644
channel.setRemoteAddress( newAddress );
}
@@ -143,6 +147,9 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -147,6 +151,9 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
{
boolean logExceptions = !( handler instanceof PingHandler );

8
Waterfall-Proxy-Patches/0027-Always-release-packets.patch
View File

@ -1,14 +1,14 @@
From 99c527b3d3e388ca5584b0e01e8009e590fc41a5 Mon Sep 17 00:00:00 2001
From 73145c83efc9cf45bc6fb0adfa0903f3c2d5b144 Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Sat, 1 May 2021 23:28:19 -0300
Subject: [PATCH] Always release packet
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index e5602230a..085cda114 100644
index fbc19f66b..a2bd24107 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -113,12 +113,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -117,12 +117,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
return;
}
@ -27,7 +27,7 @@ index e5602230a..085cda114 100644
if ( sendPacket && packet.packet != null )
{
try
@@ -133,10 +135,10 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -137,10 +139,10 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
{
handler.handle( packet );
}