From d9550259c1995d21fc345c58f2e531fdecf75acd Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Mon, 26 Dec 2022 18:50:18 -0500
Subject: Attempt to fix NPE when running profiler

---
 .../lucko/spark/forge/plugin/Forge1710ServerSparkPlugin.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'spark-forge1710/src')

diff --git a/spark-forge1710/src/main/java/me/lucko/spark/forge/plugin/Forge1710ServerSparkPlugin.java b/spark-forge1710/src/main/java/me/lucko/spark/forge/plugin/Forge1710ServerSparkPlugin.java
index 3fde91e..db9f299 100644
--- a/spark-forge1710/src/main/java/me/lucko/spark/forge/plugin/Forge1710ServerSparkPlugin.java
+++ b/spark-forge1710/src/main/java/me/lucko/spark/forge/plugin/Forge1710ServerSparkPlugin.java
@@ -88,7 +88,15 @@ public class Forge1710ServerSparkPlugin extends Forge1710SparkPlugin {
     public boolean hasPermission(ICommandSender sender, String permission) {
         if (sender instanceof EntityPlayerMP) {
             EntityPlayerMP player = (EntityPlayerMP)sender;
-            return isOp(player) || player.mcServer.getServerOwner().equals(player.getGameProfile().getName());
+            if(isOp(player))
+                return true;
+            else {
+                String serverOwner = MinecraftServer.getServer().getServerOwner();
+                if(player.getGameProfile().getName() != null && serverOwner != null)
+                    return serverOwner.equals(player.getGameProfile().getName());
+                else
+                    return false;
+            }
         } else {
             return true;
         }
-- 
cgit