#3778: Null check team collision rule because it does not exist in 1.8

SpigotMC · Feb 6, 2025 · 69861e5 · 69861e5
1 parent 22aa6f5
commit 69861e5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -284,8 +284,11 @@ public void handle(net.md_5.bungee.protocol.packet.Team team) throws Exception
                 t.setSuffix( team.getSuffix().getLeftOrCompute( ComponentSerializer::toString ) );
                 t.setFriendlyFire( team.getFriendlyFire() );
                 t.setNameTagVisibility( team.getNameTagVisibility().getKey() );
-                t.setCollisionRule( team.getCollisionRule().getKey() );
                 t.setColor( team.getColor() );
+                if ( team.getCollisionRule() != null )
+                {
+                    t.setCollisionRule( team.getCollisionRule().getKey() );
+                }
             }
             if ( team.getPlayers() != null )
             {