2018-11-11 09:40:41 +01:00
|
|
|
From eafa223c8a5c9f909276681bb61749b671c61f94 Mon Sep 17 00:00:00 2001
|
2016-05-28 18:34:39 +02:00
|
|
|
From: Techcable <Techcable@outlook.com>
|
|
|
|
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
|
2018-11-04 21:27:05 +01:00
|
|
|
index 1ebdd3f7..689d9d72 100644
|
2016-05-28 18:34:39 +02:00
|
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
2018-11-04 21:27:05 +01:00
|
|
|
@@ -257,10 +257,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
2016-05-28 18:34:39 +02:00
|
|
|
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( "" );
|
|
|
|
}
|
|
|
|
--
|
2018-10-27 23:18:13 +02:00
|
|
|
2.19.1
|
2016-05-28 18:34:39 +02:00
|
|
|
|