Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-26 18:47:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixed up stuff

Browse Source
This commit is contained in:
linsaftw 2021-05-01 11:36:56 -03:00
parent e459175cd8
commit 3df8f40933
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 7d558615b4ce5eae94afe9f013368dd7b232c27e Mon Sep 17 00:00:00 2001
From 683075f7987cdd69042088d383509914a1f148e9 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..3318b1de3 100644
index bb39d31b8..b77ce763f 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,13 +362,12 @@ index bb39d31b8..3318b1de3 100644
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandlerContext;
@@ -102,7 +103,9 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -102,7 +103,8 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
} else {
packetTypeStr = "unknown";
}
- throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
+
+ // FlameCord - Change from FastDecoderException to DecoderException
+ throw new FastDecoderException( "Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e ); // Waterfall
} finally
{

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

@ -1,4 +1,4 @@
From f460649d5c2ea74ae2ceaf9b177f63b01c9298bf Mon Sep 17 00:00:00 2001
From d37775fda46da249687d21328d25146e32db17e8 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 d36f98656..0815cac25 100644
index e08cb47dc..4aa3660d2 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>
@ -303,9 +303,9 @@ index d36f98656..0815cac25 100644
+ // FlameCord - Firewall system
+ FlameCord.getInstance().getFirewallManager().addFirewalled(ctx.channel().remoteAddress());
+
// FlameCord - Change from FastDecoderException to DecoderException
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
index bf6f85386..fa0b59c27 100644
--- a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java