mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-03 15:43:37 +01:00
Updated Upstream (BungeeCord)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: b9da505e #3142: Remove redundant name length check in InitialHandler 061a7c67 Update checkstyle
This commit is contained in:
parent
8e9b90a996
commit
eb920b88ba
@ -1 +1 @@
|
|||||||
Subproject commit 6f7331e852792224ef9e22a9f96fa54400ee417f
|
Subproject commit b9da505efe2331d26e440c74660417043be6bdba
|
@ -1,4 +1,4 @@
|
|||||||
From 40986aeb91280195823f8db867e46548074bf81b Mon Sep 17 00:00:00 2001
|
From 21881adc4dbdfd1e85fef1317b7ce830ffa83b91 Mon Sep 17 00:00:00 2001
|
||||||
From: Tux <write@imaginarycode.com>
|
From: Tux <write@imaginarycode.com>
|
||||||
Date: Thu, 19 May 2016 19:33:31 +0200
|
Date: Thu, 19 May 2016 19:33:31 +0200
|
||||||
Subject: [PATCH] POM Changes
|
Subject: [PATCH] POM Changes
|
||||||
@ -182,7 +182,7 @@ index fb797b1e..cfa0e16e 100644
|
|||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
diff --git a/config/pom.xml b/config/pom.xml
|
diff --git a/config/pom.xml b/config/pom.xml
|
||||||
index 4f3c1773..d210e093 100644
|
index 88c71b99..67e2500f 100644
|
||||||
--- a/config/pom.xml
|
--- a/config/pom.xml
|
||||||
+++ b/config/pom.xml
|
+++ b/config/pom.xml
|
||||||
@@ -4,19 +4,19 @@
|
@@ -4,19 +4,19 @@
|
||||||
@ -498,7 +498,7 @@ index f8bacabd..652a869d 100644
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 5f4cbce3..93d22dba 100644
|
index 3a793641..97056e93 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -3,18 +3,25 @@
|
@@ -3,18 +3,25 @@
|
||||||
@ -616,7 +616,7 @@ index 5f4cbce3..93d22dba 100644
|
|||||||
+ <plugin>
|
+ <plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||||
<version>3.1.1</version>
|
<version>3.1.2</version>
|
||||||
@@ -154,6 +178,7 @@
|
@@ -154,6 +178,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
@ -868,5 +868,5 @@ index 4212899e..dea7d85f 100644
|
|||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
--
|
--
|
||||||
2.30.0
|
2.32.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 6f40b978b1b45fccab4e33c16778680fb33e91d0 Mon Sep 17 00:00:00 2001
|
From 58a7123d84293c0934334b3dea3cf0b1e4fc9dbe Mon Sep 17 00:00:00 2001
|
||||||
From: Techcable <Techcable@outlook.com>
|
From: Techcable <Techcable@outlook.com>
|
||||||
Date: Mon, 14 Mar 2016 15:40:44 -0700
|
Date: Mon, 14 Mar 2016 15:40:44 -0700
|
||||||
Subject: [PATCH] Optimize uuid conversions
|
Subject: [PATCH] Optimize uuid conversions
|
||||||
@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 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
|
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 8fbb6221..9b9641d2 100644
|
index 916a0fef..3eeaeffb 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
@@ -647,7 +647,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
@@ -641,7 +641,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||||
@Override
|
@Override
|
||||||
public String getUUID()
|
public String getUUID()
|
||||||
{
|
{
|
||||||
@ -263,5 +263,5 @@ index 8fbb6221..9b9641d2 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.25.0
|
2.32.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 29c9763b3b26e4a32d8f8ef1a4fd57c32a66a693 Mon Sep 17 00:00:00 2001
|
From 81b84d57826eaa631e1f58fc6dc4b52f440582ff Mon Sep 17 00:00:00 2001
|
||||||
From: Janmm14 <computerjanimaus@yahoo.de>
|
From: Janmm14 <computerjanimaus@yahoo.de>
|
||||||
Date: Sat, 12 Dec 2015 23:43:30 +0100
|
Date: Sat, 12 Dec 2015 23:43:30 +0100
|
||||||
Subject: [PATCH] Improve server list ping logging
|
Subject: [PATCH] Improve server list ping logging
|
||||||
@ -31,10 +31,10 @@ index a859195e..b9783a4c 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
|
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 1f91fe92..b99856fb 100644
|
index 3eeaeffb..8ee21e14 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
@@ -653,20 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
@@ -647,20 +647,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||||
@Override
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
@ -69,5 +69,5 @@ index f88831f7..a667623b 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.30.1 (Apple Git-130)
|
2.32.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 07b1872dfc3b6ee50f7d266aca5c5ea854cc89b2 Mon Sep 17 00:00:00 2001
|
From 76cf77bc9f761dce7d6fe2eaf8040ddce503b2cd Mon Sep 17 00:00:00 2001
|
||||||
From: Minecrell <minecrell@minecrell.net>
|
From: Minecrell <minecrell@minecrell.net>
|
||||||
Date: Fri, 22 Sep 2017 12:46:47 +0200
|
Date: Fri, 22 Sep 2017 12:46:47 +0200
|
||||||
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
|
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
|
||||||
@ -233,7 +233,7 @@ index 00000000..93ce3b14
|
|||||||
+ </Loggers>
|
+ </Loggers>
|
||||||
+</Configuration>
|
+</Configuration>
|
||||||
diff --git a/pom.xml b/pom.xml
|
diff --git a/pom.xml b/pom.xml
|
||||||
index 93d22dba..81ccc47a 100644
|
index 97056e93..e92d5af8 100644
|
||||||
--- a/pom.xml
|
--- a/pom.xml
|
||||||
+++ b/pom.xml
|
+++ b/pom.xml
|
||||||
@@ -56,11 +56,12 @@
|
@@ -56,11 +56,12 @@
|
||||||
@ -350,7 +350,7 @@ index 00000000..765d24bc
|
|||||||
+
|
+
|
||||||
+}
|
+}
|
||||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
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 1f6ba085..617a077f 100644
|
index 1db22fc6..f281dfa1 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||||
@@ -46,7 +46,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
|
@@ -46,7 +46,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||||
@ -472,10 +472,10 @@ index bd52d880..00000000
|
|||||||
- }
|
- }
|
||||||
-}
|
-}
|
||||||
diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
|
diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
|
||||||
index 10366c88..8c5cc949 100644
|
index 9ec4920e..d3abee44 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
|
--- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
|
||||||
@@ -42,7 +42,7 @@ public class ModuleManager
|
@@ -44,7 +44,7 @@ public class ModuleManager
|
||||||
ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() );
|
ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() );
|
||||||
if ( bungeeVersion == null )
|
if ( bungeeVersion == null )
|
||||||
{
|
{
|
||||||
@ -1585,5 +1585,5 @@ index 21a48df6..00000000
|
|||||||
-
|
-
|
||||||
-}
|
-}
|
||||||
--
|
--
|
||||||
2.30.0
|
2.32.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 6dd17f3c079990f577b595797c75f427038aa111 Mon Sep 17 00:00:00 2001
|
From 079fd1ed11ba7b5c9509fd0c614f8bd3160b4140 Mon Sep 17 00:00:00 2001
|
||||||
From: phenomax <phenomax@revayd.net>
|
From: phenomax <phenomax@revayd.net>
|
||||||
Date: Thu, 10 Aug 2017 18:41:17 +0200
|
Date: Thu, 10 Aug 2017 18:41:17 +0200
|
||||||
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
|
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
|
||||||
@ -52,10 +52,10 @@ similarity index 100%
|
|||||||
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
||||||
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
|
||||||
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
|
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 5c692ef2..1771ff3c 100644
|
index 938fa31c..6c4f57eb 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
@@ -561,7 +561,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
@@ -555,7 +555,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||||
};
|
};
|
||||||
|
|
||||||
// fire login event
|
// fire login event
|
||||||
@ -65,5 +65,5 @@ index 5c692ef2..1771ff3c 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.26.1
|
2.32.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From a1d39a207c1b1bcbfcc753f31599990ccbf72a23 Mon Sep 17 00:00:00 2001
|
From b97c5f8ab7d4605fb37cf2396799b752f045e27d Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Mon, 25 Nov 2019 19:54:06 +0000
|
Date: Mon, 25 Nov 2019 19:54:06 +0000
|
||||||
Subject: [PATCH] Speed up some common exceptions
|
Subject: [PATCH] Speed up some common exceptions
|
||||||
@ -146,7 +146,7 @@ index 8b7e0708..37d28c01 100644
|
|||||||
{
|
{
|
||||||
if ( slice != null )
|
if ( slice != null )
|
||||||
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
|
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 8fb25af1..aad82d49 100644
|
index 0d30eeef..3cd4cc6f 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
@@ -12,6 +12,8 @@ import java.util.List;
|
@@ -12,6 +12,8 @@ import java.util.List;
|
||||||
@ -158,7 +158,7 @@ index 8fb25af1..aad82d49 100644
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import net.md_5.bungee.BungeeCord;
|
import net.md_5.bungee.BungeeCord;
|
||||||
@@ -424,6 +426,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
@@ -418,6 +420,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||||
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
|
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
|
||||||
|
|
||||||
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
|
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
From e3bcba72ee4cb96c3dd38fd9d55b6da9795819b7 Mon Sep 17 00:00:00 2001
|
From 9c8abefdeb145b2336e8f6618df8faafdab6dc8a Mon Sep 17 00:00:00 2001
|
||||||
From: theminecoder <theminecoder.dev@gmail.com>
|
From: theminecoder <theminecoder.dev@gmail.com>
|
||||||
Date: Sun, 19 Jul 2020 10:18:23 +1000
|
Date: Sun, 19 Jul 2020 10:18:23 +1000
|
||||||
Subject: [PATCH] Add auth url option
|
Subject: [PATCH] Add auth url option
|
||||||
|
|
||||||
|
|
||||||
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
|
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 aad82d49..08c49fcc 100644
|
index 3cd4cc6f..0f1716c0 100644
|
||||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||||
@@ -72,6 +72,8 @@ import net.md_5.bungee.util.QuietException;
|
@@ -72,6 +72,8 @@ import net.md_5.bungee.util.QuietException;
|
||||||
@ -17,7 +17,7 @@ index aad82d49..08c49fcc 100644
|
|||||||
private final BungeeCord bungee;
|
private final BungeeCord bungee;
|
||||||
private ChannelWrapper ch;
|
private ChannelWrapper ch;
|
||||||
@Getter
|
@Getter
|
||||||
@@ -452,7 +454,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
@@ -446,7 +448,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||||
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
|
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
|
||||||
|
|
||||||
String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
|
String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
|
||||||
|
Loading…
Reference in New Issue
Block a user