From e8ad5b0aa4bd59f45ac5cd2199c3de2a036a2559 Mon Sep 17 00:00:00 2001
From: rgnter <maros.prejsa1@gmail.com>
Date: Sat, 21 May 2022 11:27:12 +0200
Subject: [PATCH] team color parameter may be null, causing NPE

---
 patches/server/Adventure.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index 679ce10adf..e07be043f8 100644
--- a/patches/server/Adventure.patch
+++ b/patches/server/Adventure.patch
@@ -3446,8 +3446,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        CraftScoreboard scoreboard = checkState();
 +        if (color == null) {
 +            this.team.setColor(net.minecraft.ChatFormatting.RESET);
++        } else {
++            this.team.setColor(io.papermc.paper.adventure.PaperAdventure.asVanilla(color));
 +        }
-+        team.setColor(io.papermc.paper.adventure.PaperAdventure.asVanilla(color));
 +    }
 +    // Paper end