From 86a53e6729c7af6729b7dfca6c4098492ee0f8bf Mon Sep 17 00:00:00 2001
From: Kosma Moczek <kosma@kosma.pl>
Date: Thu, 2 Dec 2021 22:54:49 +0100
Subject: [PATCH] fabric-1.18: fix builtin permissions handling

---
 .../src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
index 9cdc46bf..6e7c017a 100644
--- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
+++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
@@ -307,7 +307,7 @@ public class DynmapPlugin {
 
     boolean hasPerm(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
+        if ((ph != null) && (psender != null) && ph.hasPermission(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.has(psender, permission);
@@ -315,7 +315,7 @@ public class DynmapPlugin {
 
     boolean hasPermNode(PlayerEntity psender, String permission) {
         PermissionsHandler ph = PermissionsHandler.getHandler();
-        if ((psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
+        if ((ph != null) && (psender != null) && ph.hasPermissionNode(psender.getName().getString(), permission)) {
             return true;
         }
         return permissions.hasPermissionNode(psender, permission);