From 756da10d46d5519a1cb3ead55484524505a23f4e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 31 Mar 2020 05:37:39 +0100
Subject: [PATCH] (Actually) Don't duplicate velocity entry into hidden-configs

---
 ...7-Add-Velocity-IP-Forwarding-Support.patch | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
index 33c63437ca..2dd54e09d8 100644
--- a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch
@@ -1,4 +1,4 @@
-From edd5923a20b3dcc4a673f8dedbd3600e6c481a5c Mon Sep 17 00:00:00 2001
+From 8ce097c9039a93f8c777387f7d46ff934f0ef995 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 092bff78ab..421e78d624 100644
+index 092bff78a..79cf4e598 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -46,7 +46,7 @@ index 092bff78ab..421e78d624 100644
 +        velocitySupport = getBoolean("settings.velocity-support.enabled", false);
 +        velocityOnlineMode = getBoolean("settings.velocity-support.online-mode", false);
 +        String secret = getString("settings.velocity-support.secret", "");
-+        if (TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
++        if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
 +            TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
 +        }
 +        if (velocitySupport && secret.isEmpty()) {
@@ -58,7 +58,7 @@ index 092bff78ab..421e78d624 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000..fdd8708f97
+index 000000000..fdd8708f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -130,7 +130,7 @@ index 0000000000..fdd8708f97
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 1c4ac7bf7a..47cf105019 100644
+index 1c4ac7bf7..47cf10501 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -206,7 +206,7 @@ index 1c4ac7bf7a..47cf105019 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 08e314af7c..046196d54d 100644
+index 08e314af7..046196d54 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -219,7 +219,7 @@ index 08e314af7c..046196d54d 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 93ae6dcd78..fb9186b3f5 100644
+index 93ae6dcd7..fb9186b3f 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -247,7 +247,7 @@ index 93ae6dcd78..fb9186b3f5 100644
          int j = this.i();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index 4d1f441395..c1ca6f9501 100644
+index 4d1f44139..c1ca6f950 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -262,7 +262,7 @@ index 4d1f441395..c1ca6f9501 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index ae74dc9e18..7eb230f1b2 100644
+index ae74dc9e1..7eb230f1b 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene
@@ -281,7 +281,7 @@ index ae74dc9e18..7eb230f1b2 100644
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4289d029c2..fa35b84597 100644
+index 4289d029c..fa35b8459 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -647,7 +647,7 @@ public final class CraftServer implements Server {