Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix exception in fabric with default permission handlers

Browse source
This commit is contained in:
Mike Primm 2021-12-22 20:36:15 -06:00
parent 46a1544efa
commit e6faf6ecb8
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java
View file

@ -330,7 +330,7 @@ public class DynmapPlugin {
boolean hasPerm(PlayerEntity psender, String permission) { boolean hasPerm(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.has(psender, permission); return permissions.has(psender, permission);
@ -338,7 +338,7 @@ public class DynmapPlugin {
boolean hasPermNode(PlayerEntity psender, String permission) { boolean hasPermNode(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.hasPermissionNode(psender, permission); return permissions.hasPermissionNode(psender, permission);

4
fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java
View file

@ -330,7 +330,7 @@ public class DynmapPlugin {
boolean hasPerm(PlayerEntity psender, String permission) { boolean hasPerm(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.has(psender, permission); return permissions.has(psender, permission);
@ -338,7 +338,7 @@ public class DynmapPlugin {
boolean hasPermNode(PlayerEntity psender, String permission) { boolean hasPermNode(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.hasPermissionNode(psender, permission); return permissions.hasPermissionNode(psender, permission);

4
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java
View file

@ -315,7 +315,7 @@ public class DynmapPlugin {
boolean hasPerm(PlayerEntity psender, String permission) { boolean hasPerm(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.has(psender, permission); return permissions.has(psender, permission);
@ -323,7 +323,7 @@ public class DynmapPlugin {
boolean hasPermNode(PlayerEntity psender, String permission) { boolean hasPermNode(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.hasPermissionNode(psender, permission); return permissions.hasPermissionNode(psender, permission);

4
fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/DynmapPlugin.java
View file

@ -316,7 +316,7 @@ public class DynmapPlugin {
boolean hasPerm(PlayerEntity psender, String permission) { boolean hasPerm(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.has(psender, permission); return permissions.has(psender, permission);
@ -324,7 +324,7 @@ public class DynmapPlugin {
boolean hasPermNode(PlayerEntity psender, String permission) { boolean hasPermNode(PlayerEntity psender, String permission) {
PermissionsHandler ph = PermissionsHandler.getHandler(); 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 true;
} }
return permissions.hasPermissionNode(psender, permission); return permissions.hasPermissionNode(psender, permission);