From 9d7e3ff31779f813dcecb055a610325fbc5b00da Mon Sep 17 00:00:00 2001 From: Techcable Date: Sun, 7 Feb 2016 00:01:19 -0700 Subject: [PATCH] Add a property to accept invalid ping packets This is disabled by default, as I don't wanna accept invalid packets You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the command line Fixes #23 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 497384c4..d6c0ce2a 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 @@ -248,10 +248,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.PING; } + private static final boolean ACCEPT_INVALID_PACKETS = Boolean.parseBoolean(System.getProperty("waterfall.acceptInvalidPackets", "false")); + @Override public void handle(PingPacket ping) throws Exception { - Preconditions.checkState( thisState == State.PING, "Not expecting PING" ); + if (!ACCEPT_INVALID_PACKETS) { + Preconditions.checkState(thisState == State.PING, "Not expecting PING"); + } unsafe.sendPacket( ping ); disconnect( "" ); } -- 2.12.0