Merge pull request #304 from SpigotMC/master

Merge upstream
HexagonMC · Jun 8, 2022 · ff1df60 · ff1df60
2 parents 02e2758 + ff5727c
commit ff1df60
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 10 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -59,14 +59,14 @@
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-connector-basic</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.3</version>
             <!-- not part of the API proper -->
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-http</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.3</version>
             <!-- not part of the API proper -->
             <scope>provided</scope>
         </dependency>

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -246,6 +246,12 @@ public static UUID readUUID(ByteBuf input)
 
     public static void writeProperties(Property[] properties, ByteBuf buf)
     {
+        if ( properties == null )
+        {
+            writeVarInt( 0, buf );
+            return;
+        }
+
         writeVarInt( properties.length, buf );
         for ( Property prop : properties )
         {

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
@@ -596,10 +596,6 @@ private void registerPacket(Class<? extends DefinedPacket> packetClass, Supplier
                 {
                     // Mapping is non current, but the next one may be ok
                     ProtocolMapping nextMapping = mappings[mappingIndex + 1];
-                    if ( nextMapping.packetID < 0 )
-                    {
-                        break;
-                    }
 
                     if ( nextMapping.protocolVersion == protocol )
                     {
@@ -610,6 +606,11 @@ private void registerPacket(Class<? extends DefinedPacket> packetClass, Supplier
                     }
                 }
 
+                if ( mapping.packetID < 0 )
+                {
+                    break;
+                }
+
                 ProtocolData data = protocols.get( protocol );
                 data.packetMap.put( packetClass, mapping.packetID );
                 data.packetConstructors.put( mapping.packetID, constructor );

diff --git a/proxy/pom.xml b/proxy/pom.xml
@@ -107,13 +107,13 @@
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-connector-basic</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.3</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.resolver</groupId>
             <artifactId>maven-resolver-transport-http</artifactId>
-            <version>1.8.0</version>
+            <version>1.7.3</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -487,6 +487,12 @@ private void sendMessage(ChatMessageType position, UUID sender, String message)
     {
         if ( getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_19 )
         {
+            // Align with Spigot and remove client side formatting for now
+            if ( position == ChatMessageType.CHAT )
+            {
+                position = ChatMessageType.SYSTEM;
+            }
+
             unsafe().sendPacket( new SystemChat( message, position.ordinal() ) );
         } else
         {

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
@@ -550,7 +550,7 @@ public void run()
                             userCon.setCompressionThreshold( BungeeCord.getInstance().config.getCompressionThreshold() );
                             userCon.init();
 
-                            unsafe.sendPacket( new LoginSuccess( getUniqueId(), getName(), loginProfile.getProperties() ) );
+                            unsafe.sendPacket( new LoginSuccess( getUniqueId(), getName(), ( loginProfile == null ) ? null : loginProfile.getProperties() ) );
                             ch.setProtocol( Protocol.GAME );
 
                             ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) );

diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -193,7 +193,7 @@ private String handleChat(String message)
                 return message;
             }
         }
-        return null;
+        throw CancelSendSignal.INSTANCE;
     }
 
     @Override