From 61440490f3b20df29223c7e6048e7c29e6ff22a5 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 22 Dec 2021 20:36:15 -0600 Subject: [PATCH] Fix exception in fabric with default permission handlers --- .../src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java | 4 ++-- .../src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java | 4 ++-- .../src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java | 4 ++-- .../src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java index dc292e52..1a283f15 100644 --- a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java +++ b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java @@ -330,7 +330,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); @@ -338,7 +338,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); diff --git a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java index 641d084c..93294ff0 100644 --- a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java +++ b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java @@ -330,7 +330,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); @@ -338,7 +338,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); diff --git a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java index 6ab02b93..5b26eb83 100644 --- a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java +++ b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java @@ -315,7 +315,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); @@ -323,7 +323,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); diff --git a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java index e781094f..3af90295 100644 --- a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java +++ b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java @@ -316,7 +316,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); @@ -324,7 +324,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);