From c49102b5e45023236ca038cfda85a41454807c0d Mon Sep 17 00:00:00 2001
From: Efe Kurban <efekurbann@gmail.com>
Date: Sat, 15 Jun 2024 04:40:57 +0300
Subject: [PATCH] Add null-check for server keys

---
 .../redisbungee/api/PlayerDataManager.java         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java b/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java
index 9aebbd2..12f360d 100644
--- a/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java
+++ b/api/src/main/java/com/imaginarycode/minecraft/redisbungee/api/PlayerDataManager.java
@@ -251,7 +251,12 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
                         responses.put(uuid, pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server"));
                     }
                     pipeline.sync();
-                    responses.forEach((uuid, response) -> builder.put(response.get(), uuid));
+                    responses.forEach((uuid, response) -> {
+                        String key = response.get();
+                        if (key == null) return;
+
+                        builder.put(key, uuid);
+                    });
                     return builder.build();
                 }
 
@@ -262,7 +267,12 @@ public abstract class PlayerDataManager<P, LE, DE, PS extends IPubSubMessageEven
                         responses.put(uuid, pipeline.hget("redis-bungee::" + networkId + "::player::" + uuid + "::data", "server"));
                     }
                     pipeline.sync();
-                    responses.forEach((uuid, response) -> builder.put(response.get(), uuid));
+                    responses.forEach((uuid, response) -> {
+                        String key = response.get();
+                        if (key == null) return;
+
+                        builder.put(key, uuid);
+                    });
                     return builder.build();
                 }
             }.call();