From 4d00d540c8a16963e040a905ebc7f1e3e92fa87e Mon Sep 17 00:00:00 2001 From: Luccboy <58391278+Luccboy@users.noreply.github.com> Date: Sat, 30 Oct 2021 15:03:40 +0200 Subject: [PATCH] Minor improvements Removed unused translations, moved command-imports to the modules-patch, registered alertraw command --- .../0020-FlameCord-General-Patch.patch | 48 +++++++------------ .../0021-FlameCord-module-system.patch | 36 ++++++++++---- ...0022-FlameCord-message-configuration.patch | 18 ++++--- .../0025-Firewall-System.patch | 30 ++++++------ 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Waterfall-Proxy-Patches/0020-FlameCord-General-Patch.patch b/Waterfall-Proxy-Patches/0020-FlameCord-General-Patch.patch index e2c4b3a..58fa83d 100644 --- a/Waterfall-Proxy-Patches/0020-FlameCord-General-Patch.patch +++ b/Waterfall-Proxy-Patches/0020-FlameCord-General-Patch.patch @@ -1,4 +1,4 @@ -From 22e56507775a8d2f89d7602977f80a584678b99f Mon Sep 17 00:00:00 2001 +From 624c0d36a8479146327e29383fe1d1b2fbbba34f Mon Sep 17 00:00:00 2001 From: Juan Cruz Linsalata Date: Mon, 12 Oct 2020 15:40:53 -0300 Subject: [PATCH] FlameCord General Patch @@ -6,7 +6,7 @@ Subject: [PATCH] FlameCord General Patch diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java new file mode 100644 -index 000000000..252612a31 +index 00000000..252612a3 --- /dev/null +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java @@ -0,0 +1,34 @@ @@ -47,7 +47,7 @@ index 000000000..252612a31 \ No newline at end of file diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java new file mode 100644 -index 000000000..81ded2243 +index 00000000..81ded224 --- /dev/null +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java @@ -0,0 +1,64 @@ @@ -116,7 +116,7 @@ index 000000000..81ded2243 + } +} 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 ec07ae6fd..91da8ab65 100644 +index ec07ae6f..91da8ab6 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 @@ @@ -128,7 +128,7 @@ index ec07ae6fd..91da8ab65 100644 import io.netty.channel.ChannelHandlerContext; 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..a323598eb +index 00000000..a323598e --- /dev/null +++ b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java @@ -0,0 +1,58 @@ @@ -191,33 +191,19 @@ index 000000000..a323598eb + } +} 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 b3f77bcab..2a702d141 100644 +index b914b5c2..719e73e4 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -9,6 +9,9 @@ import com.google.common.collect.Sets; +@@ -9,6 +9,8 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.Gson; import com.google.gson.GsonBuilder; + +import dev._2lstudios.flamecord.FlameCord; -+import dev._2lstudios.flamecord.commands.FlameCordCommand; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration; import io.github.waterfallmc.waterfall.event.ProxyExceptionEvent; -@@ -86,6 +89,12 @@ import net.md_5.bungee.conf.Configuration; - import net.md_5.bungee.conf.YamlConfig; - import net.md_5.bungee.forge.ForgeConstants; - import net.md_5.bungee.module.ModuleManager; -+import net.md_5.bungee.module.cmd.alert.CommandAlert; -+import net.md_5.bungee.module.cmd.find.CommandFind; -+import net.md_5.bungee.module.cmd.list.CommandList; -+import net.md_5.bungee.module.cmd.send.CommandSend; -+import net.md_5.bungee.module.cmd.server.CommandServer; -+import net.md_5.bungee.module.reconnect.yaml.YamlReconnectHandler; - import net.md_5.bungee.netty.PipelineUtils; - import net.md_5.bungee.protocol.DefinedPacket; - import net.md_5.bungee.protocol.ProtocolConstants; -@@ -233,11 +242,12 @@ public class BungeeCord extends ProxyServer +@@ -233,11 +235,12 @@ public class BungeeCord extends ProxyServer // Waterfall end pluginManager = new PluginManager( this ); @@ -235,7 +221,7 @@ index b3f77bcab..2a702d141 100644 if ( !Boolean.getBoolean( "net.md_5.bungee.native.disable" ) ) { -@@ -286,6 +296,15 @@ public class BungeeCord extends ProxyServer +@@ -286,6 +289,15 @@ public class BungeeCord extends ProxyServer pluginManager.loadPlugins(); config.load(); @@ -251,7 +237,7 @@ index b3f77bcab..2a702d141 100644 if ( config.isForgeSupport() ) { registerChannel( ForgeConstants.FML_TAG ); -@@ -577,9 +596,7 @@ public class BungeeCord extends ProxyServer +@@ -577,9 +589,7 @@ public class BungeeCord extends ProxyServer String translation = ""; try { @@ -263,7 +249,7 @@ index b3f77bcab..2a702d141 100644 { } diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index b25cede0e..1e01dea51 100644 +index 191ca1a6..3b1e4adc 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -1,6 +1,8 @@ @@ -285,7 +271,7 @@ index b25cede0e..1e01dea51 100644 } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index 6232f1ec0..bd5ce6a2e 100644 +index c87f8a61..70778443 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -36,6 +36,7 @@ import net.md_5.bungee.api.SkinConfiguration; @@ -319,7 +305,7 @@ index 6232f1ec0..bd5ce6a2e 100644 b.connect().addListener( listener ); } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 72e0098dc..447940111 100644 +index 72e0098d..44794011 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -17,6 +17,8 @@ import java.util.logging.Level; @@ -341,7 +327,7 @@ index 72e0098dc..447940111 100644 } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java -index a409d440b..3503c089d 100644 +index a409d440..3503c089 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java @@ -1,6 +1,7 @@ @@ -353,7 +339,7 @@ index a409d440b..3503c089d 100644 import lombok.RequiredArgsConstructor; import net.md_5.bungee.BungeeCord; 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 c0e4791f9..285433467 100644 +index 33605007..89a6d14a 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 @@ -1,6 +1,8 @@ @@ -366,7 +352,7 @@ index c0e4791f9..285433467 100644 import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.codec.CorruptedFrameException; 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 654203abb..a840bc700 100644 +index 654203ab..a840bc70 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 @@ -1,6 +1,8 @@ @@ -379,5 +365,5 @@ index 654203abb..a840bc700 100644 import io.netty.buffer.PooledByteBufAllocator; import io.netty.channel.Channel; -- -2.32.0.windows.1 +2.33.0.windows.2 diff --git a/Waterfall-Proxy-Patches/0021-FlameCord-module-system.patch b/Waterfall-Proxy-Patches/0021-FlameCord-module-system.patch index cf61e48..23d8436 100644 --- a/Waterfall-Proxy-Patches/0021-FlameCord-module-system.patch +++ b/Waterfall-Proxy-Patches/0021-FlameCord-module-system.patch @@ -1,11 +1,11 @@ -From 5515f767e5231b29a0f30d7754f3fee84a6f5e97 Mon Sep 17 00:00:00 2001 +From b7dab4ca2f05f09e2e48856bdf5c402d00bd06ea Mon Sep 17 00:00:00 2001 From: linsaftw <25271111+linsaftw@users.noreply.github.com> Date: Sat, 1 May 2021 14:17:48 -0300 Subject: [PATCH] FlameCord module system diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java -index 252612a31..2e317533e 100644 +index 252612a3..2e317533 100644 --- a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java @@ -4,6 +4,7 @@ import java.util.Collection; @@ -35,7 +35,7 @@ index 252612a31..2e317533e 100644 \ No newline at end of file diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/ModulesConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/ModulesConfiguration.java new file mode 100644 -index 000000000..e82c4844b +index 00000000..e82c4844 --- /dev/null +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/ModulesConfiguration.java @@ -0,0 +1,94 @@ @@ -134,18 +134,33 @@ index 000000000..e82c4844b + } +} 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 2a702d141..e9061e6a8 100644 +index 719e73e4..536c6052 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -12,6 +12,7 @@ import com.google.gson.GsonBuilder; +@@ -11,6 +11,8 @@ import com.google.gson.Gson; + import com.google.gson.GsonBuilder; import dev._2lstudios.flamecord.FlameCord; - import dev._2lstudios.flamecord.commands.FlameCordCommand; ++import dev._2lstudios.flamecord.commands.FlameCordCommand; +import dev._2lstudios.flamecord.configuration.ModulesConfiguration; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration; import io.github.waterfallmc.waterfall.event.ProxyExceptionEvent; -@@ -286,9 +287,10 @@ public class BungeeCord extends ProxyServer +@@ -88,6 +90,13 @@ import net.md_5.bungee.conf.Configuration; + import net.md_5.bungee.conf.YamlConfig; + import net.md_5.bungee.forge.ForgeConstants; + import net.md_5.bungee.module.ModuleManager; ++import net.md_5.bungee.module.cmd.alert.CommandAlert; ++import net.md_5.bungee.module.cmd.alert.CommandAlertRaw; ++import net.md_5.bungee.module.cmd.find.CommandFind; ++import net.md_5.bungee.module.cmd.list.CommandList; ++import net.md_5.bungee.module.cmd.send.CommandSend; ++import net.md_5.bungee.module.cmd.server.CommandServer; ++import net.md_5.bungee.module.reconnect.yaml.YamlReconnectHandler; + import net.md_5.bungee.netty.PipelineUtils; + import net.md_5.bungee.protocol.DefinedPacket; + import net.md_5.bungee.protocol.ProtocolConstants; +@@ -279,9 +288,10 @@ public class BungeeCord extends ProxyServer bossEventLoopGroup = PipelineUtils.newEventLoopGroup( 0, new ThreadFactoryBuilder().setNameFormat( "Netty Boss IO Thread #%1$d" ).build() ); workerEventLoopGroup = PipelineUtils.newEventLoopGroup( 0, new ThreadFactoryBuilder().setNameFormat( "Netty Worker IO Thread #%1$d" ).build() ); @@ -158,7 +173,7 @@ index 2a702d141..e9061e6a8 100644 pluginsFolder.mkdir(); pluginManager.detectPlugins( pluginsFolder ); -@@ -321,6 +323,7 @@ public class BungeeCord extends ProxyServer +@@ -314,6 +324,7 @@ public class BungeeCord extends ProxyServer connectionThrottle = new ConnectionThrottle( config.getThrottle(), config.getThrottleLimit() ); } startListeners(); @@ -166,7 +181,7 @@ index 2a702d141..e9061e6a8 100644 saveThread.scheduleAtFixedRate( new TimerTask() { -@@ -838,4 +841,52 @@ public class BungeeCord extends ProxyServer +@@ -831,4 +842,53 @@ public class BungeeCord extends ProxyServer { return new BungeeTitle(); } @@ -192,6 +207,7 @@ index 2a702d141..e9061e6a8 100644 + // Modules Commands + if (modulesConfiguration.alertEnabled) { + pluginManager.registerCommand(null, new CommandAlert()); ++ pluginManager.registerCommand(null, new CommandAlertRaw()); + } + if (modulesConfiguration.findEnabled) { + pluginManager.registerCommand(null, new CommandFind()); @@ -220,5 +236,5 @@ index 2a702d141..e9061e6a8 100644 + } } -- -2.32.0.windows.1 +2.33.0.windows.2 diff --git a/Waterfall-Proxy-Patches/0022-FlameCord-message-configuration.patch b/Waterfall-Proxy-Patches/0022-FlameCord-message-configuration.patch index 7017613..a4ff044 100644 --- a/Waterfall-Proxy-Patches/0022-FlameCord-message-configuration.patch +++ b/Waterfall-Proxy-Patches/0022-FlameCord-message-configuration.patch @@ -1,11 +1,11 @@ -From 6030c4824ddd3b9a496b3ad1dd7acb05799158df Mon Sep 17 00:00:00 2001 +From 30cf3c288a1222d0bc674b91fb9c4aac98734dd6 Mon Sep 17 00:00:00 2001 From: linsaftw <25271111+linsaftw@users.noreply.github.com> Date: Sat, 1 May 2021 13:40:39 -0300 Subject: [PATCH] FlameCord message configuration diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java -index 2e317533e..8957c79ac 100644 +index 2e317533..8957c79a 100644 --- a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java @@ -4,6 +4,7 @@ import java.util.Collection; @@ -35,10 +35,10 @@ index 2e317533e..8957c79ac 100644 \ No newline at end of file diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java new file mode 100644 -index 000000000..028b6d4cf +index 00000000..a32522fe --- /dev/null +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java -@@ -0,0 +1,123 @@ +@@ -0,0 +1,121 @@ +package dev._2lstudios.flamecord.configuration; + +import java.io.File; @@ -96,7 +96,6 @@ index 000000000..028b6d4cf + setIfUnexistant("outdated_server", "Outdated server! I'm still on {0}", configuration); + setIfUnexistant("proxy_full", "Server is full!", configuration); + setIfUnexistant("restart", "[Proxy] Proxy restarting.", configuration); -+ setIfUnexistant("server_kick", "[Kicked] ", configuration); + setIfUnexistant("server_list", "&6You may connect to the following servers at this time: ", configuration); + setIfUnexistant("server_went_down", + "&cThe server you were previously on went down, you have been connected to a fallback server", @@ -117,7 +116,6 @@ index 000000000..028b6d4cf + setIfUnexistant("send_cmd_usage", + "&cNot enough arguments, usage: /send ", configuration); + setIfUnexistant("player_only", "&cOnly in game players can use this command", configuration); -+ setIfUnexistant("successfully_summoned", "&aSuccessfully summoned player(s)", configuration); + setIfUnexistant("you_got_summoned", "&6Summoned to {0} by {1}", configuration); + setIfUnexistant("command_perms_groups", "&6You have the following groups: {0}", configuration); + setIfUnexistant("command_perms_permission", "&9- {0}", configuration); @@ -164,7 +162,7 @@ index 000000000..028b6d4cf +} \ No newline at end of file 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 a323598eb..bf6f85386 100644 +index a323598e..bf6f8538 100644 --- a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java +++ b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java @@ -4,6 +4,7 @@ import java.util.Collection; @@ -211,10 +209,10 @@ index a323598eb..bf6f85386 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 e9061e6a8..e3604c0f6 100644 +index 536c6052..2327e5e3 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -596,14 +596,8 @@ public class BungeeCord extends ProxyServer +@@ -597,14 +597,8 @@ public class BungeeCord extends ProxyServer @Override public String getTranslation(String name, Object... args) { @@ -232,5 +230,5 @@ index e9061e6a8..e3604c0f6 100644 @Override -- -2.32.0.windows.1 +2.33.0.windows.2 diff --git a/Waterfall-Proxy-Patches/0025-Firewall-System.patch b/Waterfall-Proxy-Patches/0025-Firewall-System.patch index 8be3723..be60c1a 100644 --- a/Waterfall-Proxy-Patches/0025-Firewall-System.patch +++ b/Waterfall-Proxy-Patches/0025-Firewall-System.patch @@ -1,11 +1,11 @@ -From 6e800ce464c39da6b513e08f7227b380a161f80a Mon Sep 17 00:00:00 2001 +From 4448ba222341e511e7b2add8e6c10c315d3d6a73 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 diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java -index 8957c79ac..fd889644f 100644 +index 8957c79a..fd889644 100644 --- a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java @@ -6,6 +6,7 @@ import java.util.logging.Logger; @@ -64,7 +64,7 @@ index 8957c79ac..fd889644f 100644 } \ No newline at end of file diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java -index 81ded2243..8bb61ac11 100644 +index 81ded224..8bb61ac1 100644 --- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java @@ -12,6 +12,15 @@ import net.md_5.bungee.config.Configuration; @@ -96,10 +96,10 @@ index 81ded2243..8bb61ac11 100644 configurationProvider.save(configuration, configurationFile); } diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java -index 028b6d4cf..560446318 100644 +index a32522fe..72d48d66 100644 --- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java -@@ -84,9 +84,17 @@ public class MessagesConfiguration { +@@ -82,9 +82,17 @@ public class MessagesConfiguration { setIfUnexistant("illegal_chat_characters", "&cIllegal characters in chat ({0})", configuration); // FlameCord @@ -120,7 +120,7 @@ index 028b6d4cf..560446318 100644 diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/firewall/FirewallManager.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/firewall/FirewallManager.java new file mode 100644 -index 000000000..dfb5c6d30 +index 00000000..dfb5c6d3 --- /dev/null +++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/firewall/FirewallManager.java @@ -0,0 +1,120 @@ @@ -246,7 +246,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 c03e1b513..7f4b5b45a 100644 +index c03e1b51..7f4b5b45 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 @@ -46,8 +46,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder @@ -275,7 +275,7 @@ index c03e1b513..7f4b5b45a 100644 } 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 +index bf6f8538..fa0b59c2 100644 --- a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java +++ b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java @@ -5,6 +5,7 @@ import java.util.HashSet; @@ -303,7 +303,7 @@ index bf6f85386..fa0b59c27 100644 // FlameCord - Collect ips from servers final Collection whitelistedAddresses = new HashSet<>(); diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index 7bc9b1b47..b4f9e3a7d 100644 +index 3b1e4adc..ab9d3ca8 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -166,6 +166,9 @@ public class ServerConnector extends PacketHandler @@ -317,7 +317,7 @@ index 7bc9b1b47..b4f9e3a7d 100644 } } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 447940111..8f142f488 100644 +index 44794011..8f142f48 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -156,6 +156,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -357,7 +357,7 @@ index 447940111..8f142f488 100644 int limit = BungeeCord.getInstance().config.getPlayerLimit(); diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java -index 3503c089d..283b3134f 100644 +index 3503c089..283b3134 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java @@ -2,6 +2,7 @@ package net.md_5.bungee.connection; @@ -379,7 +379,7 @@ index 3503c089d..283b3134f 100644 } } 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 89a6d14a9..224146868 100644 +index 89a6d14a..22414686 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 @@ -11,6 +11,7 @@ import io.netty.handler.codec.haproxy.HAProxyMessage; @@ -391,7 +391,7 @@ index 89a6d14a9..224146868 100644 import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.connection.CancelSendSignal; 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 a840bc700..f7455a7ee 100644 +index a840bc70..f7455a7e 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 @@ -63,8 +63,16 @@ public class PipelineUtils @@ -412,7 +412,7 @@ index a840bc700..f7455a7ee 100644 return; } diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java -index b3bdfd05e..49d53f177 100644 +index b3bdfd05..49d53f17 100644 --- a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java +++ b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java @@ -2,6 +2,8 @@ package net.md_5.bungee.query; @@ -445,5 +445,5 @@ index b3bdfd05e..49d53f177 100644 throw new IllegalStateException( "Invalid data request packet" ); } -- -2.32.0.windows.1 +2.33.0.windows.2