Fix Forge player tracking NullPointerException.

KosmX · Aug 21, 2022 · 97ff039 · 97ff039
1 parent 011c113
commit 97ff039
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/16/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java b/16/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java
@@ -181,6 +181,8 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {
 
     public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
         TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());
-        tracker.getPlayersTracking().forEach(consumer);
+        if (tracker != null) {
+            tracker.getPlayersTracking().forEach(consumer);
+        }
     }
 }
diff --git a/18/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java b/18/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java
@@ -181,6 +181,8 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {
 
     public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
         TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());
-        tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));
+        if (tracker != null) {
+            tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));
+        }
     }
 }
diff --git a/19/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java b/19/forge/src/main/java/io/github/kosmx/emotes/forge/network/ServerNetwork.java
@@ -182,6 +182,8 @@ protected void sendForPlayer(NetData data, Player player, UUID target) {
 
     public static void sendConsumer(Player player, Consumer<ServerPlayer> consumer){
         TrackedEntityAccessor tracker = ((ChunkMapAccessor)((ServerChunkCache)player.getCommandSenderWorld().getChunkSource()).chunkMap).getTrackedEntity().get(player.getId());
-        tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));
+        if (tracker != null) {
+            tracker.getPlayersTracking().forEach(serverPlayerConnection -> consumer.accept(serverPlayerConnection.getPlayer()));
+        }
     }
 }