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

fabric-1.18: fix builtin permissions handling

Browse source
This commit is contained in:
Kosma Moczek 2021-12-02 22:54:49 +01:00
parent 34ed98637f
commit 6f5c7f4eb4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fabric-1.18/src/main/java/org/dynmap/fabric_1_18/DynmapPlugin.java
View file

@ -307,7 +307,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);
@ -315,7 +315,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);