Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-05 14:31:57 +01:00
Code Issues Projects Releases Wiki Activity

Remove unnecesary space

Browse Source
This commit is contained in:
linsaftw 2021-05-01 11:46:41 -03:00
parent 8003de7e56
commit 719dfa7ee4
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Waterfall-Proxy-Patches/0023-FlameCord-General-Patch.patch
View File

@ -1,4 +1,4 @@
From 93913f1b0c1df49b257894947944ad9ef4e46425 Mon Sep 17 00:00:00 2001
From 55134b87570446f86306234e3868d73785efe804 Mon Sep 17 00:00:00 2001
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
Date: Mon, 12 Oct 2020 15:40:53 -0300
Subject: [PATCH] FlameCord General Patch
@ -352,7 +352,7 @@ index 000000000..e82c4844b
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index bb39d31b8..62052d7f7 100644
index bb39d31b8..28edad1a7 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -1,5 +1,6 @@
@ -362,14 +362,6 @@ index bb39d31b8..62052d7f7 100644
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandlerContext;
@@ -102,6 +103,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
} else {
packetTypeStr = "unknown";
}
+
throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
} finally
{
diff --git a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
new file mode 100644
index 000000000..bf6f85386

10
Waterfall-Proxy-Patches/0026-Firewall-System.patch
View File

@ -1,4 +1,4 @@
From c366cae9359b1f027225fd6c2a4365b162857c01 Mon Sep 17 00:00:00 2001
From 9dd65918d56668166b82233f084c25bdb974f05c Mon Sep 17 00:00:00 2001
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
Date: Fri, 30 Apr 2021 22:54:44 -0300
Subject: [PATCH] Firewall System
@ -283,7 +283,7 @@ index 000000000..dfb5c6d30
+}
\ No newline at end of file
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 79a78b318..744f6dc1c 100644
index 107855b83..e8942767c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -45,6 +45,9 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -296,13 +296,13 @@ index 79a78b318..744f6dc1c 100644
if (readableBytes > 2097152) {
throw new FastDecoderException("Error decoding packet with too many readableBytes: " + readableBytes);
} else if (capacity > 2097152) {
@@ -107,6 +110,9 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -106,6 +109,9 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
} else {
packetTypeStr = "unknown";
}
+
+ // FlameCord - Firewall system
+ FlameCord.getInstance().getFirewallManager().addFirewalled(ctx.channel().remoteAddress());
+
throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
} finally
{