Updated Upstream (BungeeCord) (#804)

This commit is contained in:
Juan Cruz Linsalata 2023-06-04 14:12:26 -03:00 committed by GitHub
parent 73e6de29cc
commit 813d54bc71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 79 additions and 83 deletions

@ -1 +1 @@
Subproject commit a0a4fa0e5673c645ffae3fbc025dd05c2abe957e Subproject commit 188d502c59a45980583f9226f4e9d631d023c527

View File

@ -1,4 +1,4 @@
From 921905301dbe44a7c95763e1114227fcb131295c Mon Sep 17 00:00:00 2001 From 0bab19d41f1f1062e6d8232d05255e0e16ce355a 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
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo - Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml diff --git a/api/pom.xml b/api/pom.xml
index 81179f0f..a680e7b0 100644 index 6b08df37..163fc93b 100644
--- a/api/pom.xml --- a/api/pom.xml
+++ b/api/pom.xml +++ b/api/pom.xml
@@ -4,42 +4,42 @@ @@ -4,42 +4,42 @@
@ -67,7 +67,7 @@ index 81179f0f..a680e7b0 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 06444181..c988cf5d 100644 index 6a3258f4..5ec5faf7 100644
--- a/bootstrap/pom.xml --- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml +++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@ @@ -4,39 +4,40 @@
@ -506,7 +506,7 @@ index c7478c96..e137dfcc 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index f9aa2c69..4c4597f6 100644 index c118aa69..432fd5c5 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
@ -624,7 +624,7 @@ index f9aa2c69..4c4597f6 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.2.1</version> <version>3.3.0</version>
@@ -164,6 +188,7 @@ @@ -164,6 +188,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
@ -633,7 +633,7 @@ index f9aa2c69..4c4597f6 100644
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId> <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -300,6 +325,7 @@ @@ -325,6 +350,7 @@
<!-- lombok does not add @return or @param which causes warnings, so ignore --> <!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint> <doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath> <sourcepath>${project.build.directory}/delombok</sourcepath>
@ -641,7 +641,7 @@ index f9aa2c69..4c4597f6 100644
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@@ -331,5 +357,88 @@ @@ -356,5 +382,88 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
@ -772,7 +772,7 @@ index bb2b14fc..221469b9 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index 3a8aaa35..5135c0fd 100644 index f11a4fb7..f2a97611 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
@ -884,5 +884,5 @@ index 90a4c8d5..81af5457 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.17.2 (Apple Git-113) 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 3a8d473e3e304df19e648d61588b3ec23051d74a Mon Sep 17 00:00:00 2001 From d1323d4e9c014a055817c840b85918e12b1d7add Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200 Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api. Subject: [PATCH] Add dynamic server addition/removal api.
@ -170,10 +170,10 @@ index 59c104d3..698b420f 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT ); private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
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 0c9ffbf6..8f6923a5 100644 index 93a96bfd..5af9c3bb 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
@@ -660,10 +660,18 @@ public class BungeeCord extends ProxyServer @@ -664,10 +664,18 @@ public class BungeeCord extends ProxyServer
return config.getServers(); return config.getServers();
} }
@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
+ // Waterfall end + // Waterfall end
} }
-- --
2.38.1 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 6aed025ba52a9bcfaca7663d6a06afd04d219630 Mon Sep 17 00:00:00 2001 From 9ddaf6095bd50bf2c70d7fbf08bec00b0060105d Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500 Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response Subject: [PATCH] Configurable server version in ping response
@ -66,10 +66,10 @@ index 91743f01..111404fb 100644
public int getTabThrottle() { public int getTabThrottle() {
return tabThrottle; return tabThrottle;
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 8f6923a5..a1ec1c17 100644 index 5af9c3bb..166565a7 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
@@ -714,7 +714,7 @@ public class BungeeCord extends ProxyServer @@ -718,7 +718,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getGameVersion() public String getGameVersion()
{ {
@ -79,5 +79,5 @@ index 8f6923a5..a1ec1c17 100644
@Override @Override
-- --
2.38.1 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 8b5d2b3876a6919a98b3573238ce80d45f65030c Mon Sep 17 00:00:00 2001 From 43de49256f52a8990a41b6194163023d1e169f3d 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
@ -39,7 +39,7 @@ index 5ec5faf7..f9ec2c1c 100644
</build> </build>
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644 new file mode 100644
index 00000000..44bf7f91 index 00000000..9c561bcc
--- /dev/null --- /dev/null
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -63,7 +63,7 @@ index 00000000..44bf7f91
+ <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description> + <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
+ +
+ <properties> + <properties>
+ <log4j2.version>2.17.2</log4j2.version> + <log4j2.version>2.20.0</log4j2.version>
+ </properties> + </properties>
+ +
+ <dependencies> + <dependencies>
@ -233,7 +233,7 @@ index 00000000..cfd039cd
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index de5b2410..c7a036c3 100644 index 432fd5c5..77991d81 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -56,11 +56,12 @@ @@ -56,11 +56,12 @@
@ -251,7 +251,7 @@ index de5b2410..c7a036c3 100644
</modules> </modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index 3a9afae9..61172190 100644 index e004f988..368df864 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
@ -278,8 +278,8 @@ index 3a9afae9..61172190 100644
<dependency> <dependency>
<groupId>net.sf.jopt-simple</groupId> <groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId> <artifactId>jopt-simple</artifactId>
@@ -130,6 +131,25 @@ @@ -130,6 +131,35 @@
<version>1.9.7</version> <version>1.9.10</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
+ <!-- Waterfall start - Console improvements - bring back slf4j--> + <!-- Waterfall start - Console improvements - bring back slf4j-->
@ -293,6 +293,16 @@ index 3a9afae9..61172190 100644
+ <groupId>net.minecrell</groupId> + <groupId>net.minecrell</groupId>
+ <artifactId>terminalconsoleappender</artifactId> + <artifactId>terminalconsoleappender</artifactId>
+ <version>1.3.0</version> + <version>1.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.jline</groupId> + <groupId>org.jline</groupId>
@ -350,7 +360,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 1da5db3d..77a19a29 100644 index 166565a7..71bb3d9d 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
@@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -1617,5 +1627,5 @@ index 21a48df6..00000000
- -
-} -}
-- --
2.40.0 2.40.1.windows.1

View File

@ -1,11 +1,11 @@
From f5fe955f7406c4778aeeae08ca0624d2c0b6fa12 Mon Sep 17 00:00:00 2001 From b773b7b9601c7f191de0849bd58e0758a549d2fc Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200 Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml diff --git a/api/pom.xml b/api/pom.xml
index a680e7b0..6774bed3 100644 index 163fc93b..9a01f8c6 100644
--- a/api/pom.xml --- a/api/pom.xml
+++ b/api/pom.xml +++ b/api/pom.xml
@@ -75,5 +75,11 @@ @@ -75,5 +75,11 @@
@ -16,7 +16,7 @@ index a680e7b0..6774bed3 100644
+ <dependency> + <dependency>
+ <groupId>org.slf4j</groupId> + <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-api</artifactId>
+ <version>1.7.25</version> + <version>1.7.36</version>
+ </dependency> + </dependency>
</dependencies> </dependencies>
</project> </project>
@ -39,10 +39,10 @@ index 9660234d..3d1e9a3a 100644
* Called when the plugin has just been loaded. Most of the proxy will not * Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering * be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
index 44bf7f91..fb091698 100644 index 9c561bcc..a01910ee 100644
--- a/log4j/pom.xml --- a/log4j/pom.xml
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -38,6 +38,12 @@ @@ -38,6 +38,24 @@
<artifactId>log4j-jul</artifactId> <artifactId>log4j-jul</artifactId>
<version>${log4j2.version}</version> <version>${log4j2.version}</version>
</dependency> </dependency>
@ -51,10 +51,22 @@ index 44bf7f91..fb091698 100644
+ <artifactId>log4j-slf4j-impl</artifactId> + <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version> + <version>${log4j2.version}</version>
+ <scope>runtime</scope> + <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ <scope>runtime</scope>
+ </dependency> + </dependency>
<dependency> <dependency>
<groupId>com.lmax</groupId> <groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
-- --
2.17.2 (Apple Git-113) 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 9fe93823a56f1f2b50458d1842b2d9d5b79fecdb Mon Sep 17 00:00:00 2001 From 5b38d62ee22949fb09c3b833d49b73c10f52d32b Mon Sep 17 00:00:00 2001
From: FivePB <admin@fivepb.me> From: FivePB <admin@fivepb.me>
Date: Tue, 16 Nov 2021 21:15:32 +0100 Date: Tue, 16 Nov 2021 21:15:32 +0100
Subject: [PATCH] Configurable plugin messaging limits Subject: [PATCH] Configurable plugin messaging limits
@ -83,7 +83,7 @@ index b88e3c8a..da0efa36 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 55620acc..80d8843f 100644 index d31901cc..e3447ee4 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
@@ -755,9 +755,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -755,9 +755,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -101,5 +101,5 @@ index 55620acc..80d8843f 100644
} }
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) ) } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
-- --
2.38.1 2.40.1.windows.1

View File

@ -1,26 +0,0 @@
From 2cd21b7b20cde396fa6d8713116f055dce6b72f4 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 9 Jul 2021 13:20:36 +0100
Subject: [PATCH] Don't bother locking to fetch a v4 UUID from the offline
UUIDs map
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 15fb4ad2..e0fcd8fb 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -634,6 +634,11 @@ public class BungeeCord extends ProxyServer
public UserConnection getPlayerByOfflineUUID(UUID name)
{
+ // Waterfall start - Skip lock if we get a v4 UUID, we're not gonna be in here
+ if (name != null && name.version() == 4) {
+ return null;
+ }
+ // Waterfall end
connectionLock.readLock().lock();
try
{
--
2.38.1

View File

@ -1,4 +1,4 @@
From dbbaf10f0d11e08489bd0e29b3788ea76bf282ac Mon Sep 17 00:00:00 2001 From 1a76bca6c617df82e2f9d0fa7457d6b727eabb71 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 16 Apr 2021 06:29:28 +0100 Date: Fri, 16 Apr 2021 06:29:28 +0100
Subject: [PATCH] ServerConnectRequest#sendFeedback Subject: [PATCH] ServerConnectRequest#sendFeedback
@ -31,7 +31,7 @@ index c81b0a4e..d21370be 100644
} }
} }
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java 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 5961392a..eb236957 100644 index 35bf4c9f..88e31adb 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer @@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer
@ -90,5 +90,5 @@ index 5961392a..eb236957 100644
} }
} }
-- --
2.37.2 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From ab3fe51154af6559ace6fba45542f6ad982f339f Mon Sep 17 00:00:00 2001 From 441c10ca0e6b479ad56718e9b17ad6d18f992afc Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 22 Mar 2022 14:56:44 +0000 Date: Tue, 22 Mar 2022 14:56:44 +0000
Subject: [PATCH] Don't send exceptions to the client during kicks, etc Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@ -13,7 +13,7 @@ allows for retaining much of the overall context here, i.e. who
was this exception assocated with? was this exception assocated with?
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java 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 eb236957..b44d13e5 100644 index 88e31adb..bc0af8a5 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -399,7 +399,8 @@ public final class UserConnection implements ProxiedPlayer @@ -399,7 +399,8 @@ public final class UserConnection implements ProxiedPlayer
@ -27,5 +27,5 @@ index eb236957..b44d13e5 100644
@Override @Override
-- --
2.37.2 2.40.1.windows.1

View File

@ -1,11 +1,11 @@
From 109cbe179f1d34fe5da186c8ea3e32f2a7236053 Mon Sep 17 00:00:00 2001 From e9d0d6cd8b81b710b8c1c5f3e1f54b507363327b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 8 May 2022 12:04:30 +0100 Date: Sun, 8 May 2022 12:04:30 +0100
Subject: [PATCH] Improve login state transition Subject: [PATCH] Improve login state transition
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 80d8843f..e8ceddf7 100644 index e3447ee4..e23d6352 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
@@ -473,6 +473,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -473,6 +473,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -26,5 +26,5 @@ index 80d8843f..e8ceddf7 100644
} }
-- --
2.38.1 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 07827a2a1caaa1a86a044e3071bcec6c90be1ac0 Mon Sep 17 00:00:00 2001 From 9d26478458acb2fb096822ff3a796795ad7fbb39 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Jun 2022 06:45:54 +0100 Date: Sun, 12 Jun 2022 06:45:54 +0100
Subject: [PATCH] Add protocol version to packet not found message Subject: [PATCH] Add protocol version to packet not found message
@ -34,5 +34,5 @@ index 7e0c4f7a..8bf14d56 100644
} }
} }
-- --
2.37.3.windows.1 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 1b92363555d7dfb55df0360c64e8fc18d2f5716c Mon Sep 17 00:00:00 2001 From 046016c634919b94cb990e4aa05e7b9cdc28f54d Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 19 Jun 2022 10:31:51 +0100 Date: Sun, 19 Jun 2022 10:31:51 +0100
Subject: [PATCH] Expand packet-decode-logging usage Subject: [PATCH] Expand packet-decode-logging usage
@ -24,5 +24,5 @@ index 33494237..29cf4b4f 100644
{ {
ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[] ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[]
-- --
2.37.2 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 577049261537afb57f99737f5e2770dc83052713 Mon Sep 17 00:00:00 2001 From 64bdfdccac0ae290d6a5767fbdd38f5245750e70 Mon Sep 17 00:00:00 2001
From: Aurora <aurora@relanet.eu> From: Aurora <aurora@relanet.eu>
Date: Mon, 18 Jul 2022 15:56:05 +0200 Date: Mon, 18 Jul 2022 15:56:05 +0200
Subject: [PATCH] Add message for outdated clients that don't support secure Subject: [PATCH] Add message for outdated clients that don't support secure
@ -8,7 +8,7 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
things checked those outdated clients didn't get a useful message telling them to update. things checked those outdated clients didn't get a useful message telling them to update.
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 789214de..a19bbdd0 100644 index e23d6352..ae842636 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
@@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -32,5 +32,5 @@ index e42b798b..76ad621f 100644
error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details) error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
error_occurred_console=\u00a7cAn error occurred while parsing your message: {0} error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
-- --
2.38.1 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From 6e1e60f3aa293c9337de01da58eb6f6628870840 Mon Sep 17 00:00:00 2001 From b235367256f401fbc68e02e7d34bb7b568e4751c Mon Sep 17 00:00:00 2001
From: Janmm14 <gitconfig1@janmm14.de> From: Janmm14 <gitconfig1@janmm14.de>
Date: Mon, 21 Jun 2021 23:43:39 +0200 Date: Mon, 21 Jun 2021 23:43:39 +0200
Subject: [PATCH] Replace reflection inside netty with ChannelFactory. Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@ -6,7 +6,7 @@ Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
Thanks for pointing it out @MrIvanPlays Thanks for pointing it out @MrIvanPlays
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 87b1698f..d88c296a 100644 index 3a86fac8..a7091ab6 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
@@ -358,7 +358,7 @@ public class BungeeCord extends ProxyServer @@ -358,7 +358,7 @@ public class BungeeCord extends ProxyServer
@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
{ {
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class; return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
-- --
2.40.0 2.40.1.windows.1

View File

@ -1,4 +1,4 @@
From e9eb9dac39a0b4ca9e98b06b7b9ed70e9175b233 Mon Sep 17 00:00:00 2001 From 89a9c3c9f0136f173f045385925357b6d9a9bc9b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 21 Apr 2023 15:32:33 +0100 Date: Fri, 21 Apr 2023 15:32:33 +0100
Subject: [PATCH] reduce log spam from clients registeirng too many channels Subject: [PATCH] reduce log spam from clients registeirng too many channels
@ -28,5 +28,5 @@ index ae842636..ca0e3764 100644
@Override @Override
-- --
2.40.0 2.40.1.windows.1