From b4dca6a1b4a0064eeeaf28f91bb0baa4dcceb9b0 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 2 Nov 2024 13:06:10 -0500
Subject: [PATCH] Fix MC_CLIENT.getPlayerCount() null pointer

---
 .../wrappers/minecraft/MinecraftClientWrapper.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
index 1b2771322..4ed15391d 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java
@@ -340,7 +340,15 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public int getPlayerCount()
 	{
-		return Objects.requireNonNull(MINECRAFT.getSingleplayerServer()).getPlayerCount();
+		// can be null if the server hasn't finished booting up yet
+		if (MINECRAFT.getSingleplayerServer() == null)
+		{
+			return 1;
+		}
+		else
+		{
+			return MINECRAFT.getSingleplayerServer().getPlayerCount();
+		}
 	}
 	
 }