Reinstate patch to prevent Kick during Handshake

Remove redundant patch from fire-pit
PaperMC · Dec 4, 2016 · cbe6a1b · cbe6a1b
1 parent 3a62539
commit cbe6a1b
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 274 deletions.
diff --git a/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch b/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch
@@ -1,4 +1,4 @@
-From b184d9c318f57c05d28cca0ce8724be2c3dd8187 Mon Sep 17 00:00:00 2001
+From f2d863aa87a12f7611d7d1910597e41b89ce8c85 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -114,5 +114,5 @@ index c7547c7..82ff91a 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.7.4 (Apple Git-66)
+2.10.0
 
diff --git a/BungeeCord-Patches/0033-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch b/BungeeCord-Patches/0033-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch
@@ -0,0 +1,22 @@
+From b3e9c9b6ba4a0bba0e697782a5412499909216dd Mon Sep 17 00:00:00 2001
+From: Techcable <Techcable@techcable.net>
+Date: Mon, 6 Jun 2016 13:36:10 -0600
+Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
+
+
+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 bbad8dd..6ba098a 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
+@@ -551,7 +551,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+             @Override
+             public void run()
+             {
+-                if ( thisState != State.STATUS && thisState != State.PING )
++                if ( thisState != State.STATUS && thisState != State.PING && thisState != State.HANDSHAKE ) // Waterfall: Don't kick during handshake
+                 {
+                     unsafe().sendPacket( new Kick( ComponentSerializer.toString( reason ) ) );
+                 }
+-- 
+2.10.0
+
diff --git a/...atches/0033-Improve-ServerKickEvent.patch → ...atches/0034-Improve-ServerKickEvent.patch b/...atches/0033-Improve-ServerKickEvent.patch → ...atches/0034-Improve-ServerKickEvent.patch
@@ -1,4 +1,4 @@
-From 9f641cadaeec788313843c830cc4c2643b183316 Mon Sep 17 00:00:00 2001
+From e072edbf35417eacae29526145e965f92db35ff6 Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent

diff --git a/...ble-server-version-in-ping-response.patch → ...ble-server-version-in-ping-response.patch b/...ble-server-version-in-ping-response.patch → ...ble-server-version-in-ping-response.patch
@@ -1,4 +1,4 @@
-From 167338d235ef25f4c143f6b26348485ef90ea9c6 Mon Sep 17 00:00:00 2001
+From ef40f84049f7b8e335ca901484d48940b1894b56 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response

diff --git a/...-timeout-variant-to-connect-methods.patch → ...-timeout-variant-to-connect-methods.patch b/...-timeout-variant-to-connect-methods.patch → ...-timeout-variant-to-connect-methods.patch
@@ -1,4 +1,4 @@
-From 8db3af1afef62b24256ad9d49dce060333b67a9d Mon Sep 17 00:00:00 2001
+From 30ba27e5de5a18b6dada9d3b2591966ef0e3e1a4 Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -49,7 +49,7 @@ index 375815c..c49e900 100644
       * Gets the server this player is connected to.
       *
 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 81c2376..424830e 100644
+index a5f0e15..bbe4f15 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -248,6 +248,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -84,5 +84,5 @@ index 81c2376..424830e 100644
          // Windows is bugged, multi homed users will just have to live with random connecting IPs
          if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
 -- 
-2.10.2
+2.10.0
 
diff --git a/...Cord-Patches/0036-Proxy-query-event.patch → ...Cord-Patches/0037-Proxy-query-event.patch b/...Cord-Patches/0036-Proxy-query-event.patch → ...Cord-Patches/0037-Proxy-query-event.patch
@@ -1,4 +1,4 @@
-From dff3f58774e79f8e655813e21b0ea0d7c724e15b Mon Sep 17 00:00:00 2001
+From 525fdfdfc386c3fb335f162ad1c665bd8406669d Mon Sep 17 00:00:00 2001
 From: minecrafter <unknown@unknown>
 Date: Sun, 3 Jul 2016 04:03:21 -0400
 Subject: [PATCH] Proxy query event

diff --git a/...hex-of-a-packet-on-a-decoding-error.patch → ...hex-of-a-packet-on-a-decoding-error.patch b/...hex-of-a-packet-on-a-decoding-error.patch → ...hex-of-a-packet-on-a-decoding-error.patch
@@ -1,4 +1,4 @@
-From e4d11ee967d8c4ece85697de3d5fb93de0358b37 Mon Sep 17 00:00:00 2001
+From b3db0f96024f1974630abef51a25175b3c975027 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error

diff --git a/...otion-race-condition-on-Forge-1.8.9.patch → ...otion-race-condition-on-Forge-1.8.9.patch b/...otion-race-condition-on-Forge-1.8.9.patch → ...otion-race-condition-on-Forge-1.8.9.patch
@@ -1,4 +1,4 @@
-From 340eedc8b19ec16f1178d048dac9c866cb604616 Mon Sep 17 00:00:00 2001
+From 9ff87b6b5620691cb02d7c1310209d3ead3f9eaf Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 16:38:37 -0400
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@@ -32,7 +32,7 @@ index 6f782c8..2d5fc48 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index 4decbb2..f45737a 100644
+index 8a857ad..741166d 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@@ -160,7 +160,7 @@ index 0000000..7ed2dc3
 +    }
 +}
 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 7e934ef..3f1b133 100644
+index bbe4f15..9cc7f3f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -2,7 +2,9 @@ package net.md_5.bungee;
@@ -185,7 +185,7 @@ index 7e934ef..3f1b133 100644
      @Getter
      private String displayName;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 2a1a719..4ce0e12 100644
+index 356cf4f..cb0f08c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 @@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler;

diff --git a/fire-pit/0026-Improve-connection-closing-fixing-the-kick-delay.patch b/fire-pit/0026-Improve-connection-closing-fixing-the-kick-delay.patch
diff --git a/fire-pit/0033-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch b/fire-pit/0033-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch