Don't add base protocols in bulk

ViaVersion · Dec 10, 2024 · f736910 · f736910
1 parent 8db4b2a
commit f736910
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,10 +7,10 @@ group = "com.viaversion.viabungee"
 version = "0.1.3"
 
 dependencies {
-    compileOnly("com.viaversion:viaversion-common:5.1.0")
-    compileOnly("com.viaversion:viabackwards-common:5.1.0")
-    compileOnly("com.viaversion:viarewind-common:4.0.2")
-    compileOnly("net.raphimc:viaaprilfools-common:3.0.1")
+    compileOnly("com.viaversion:viaversion-common:5.2.0")
+    compileOnly("com.viaversion:viabackwards-common:5.2.0")
+    compileOnly("com.viaversion:viarewind-common:4.0.4")
+    compileOnly("net.raphimc:viaaprilfools-common:3.0.4")
     compileOnly("net.md-5:bungeecord-api:1.20-R0.3-SNAPSHOT")
     implementation("net.lenni0451:Reflect:1.4.0")
 }

diff --git a/src/main/java/com/viaversion/bungee/handlers/BungeeServerHandler.java b/src/main/java/com/viaversion/bungee/handlers/BungeeServerHandler.java
@@ -24,6 +24,7 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.entity.ClientEntityIdChangeListener;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.ProtocolPathEntry;
 import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -264,8 +265,11 @@ public void checkServerChange(ServerConnectedEvent event, UserConnection user) t
             info.setServerProtocolVersion(serverProtocolVersion);
         }
 
-        // Add version-specific base Protocol
-        pipeline.add(Via.getManager().getProtocolManager().getBaseProtocols(info.protocolVersion(), serverProtocolVersion));
+        // Add version-specific base Protocols
+        final List<Protocol> baseProtocols = Via.getManager().getProtocolManager().getBaseProtocols(info.protocolVersion(), serverProtocolVersion);
+        for (final Protocol<?, ?, ?, ?> protocol : baseProtocols) {
+            pipeline.add(protocol);
+        }
 
         // Workaround 1.13 server change
         boolean toNewId = previousServerProtocol.olderThan(ProtocolVersion.v1_13) && serverProtocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_13);