Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 03:05:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible nullref

Browse Source
This commit is contained in:
Bond_009 2021-07-04 21:42:48 +02:00
parent 0b37826fad
commit a99bbee900
6 changed files with 18 additions and 18 deletions
Show Stats 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.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
View File

@ -328,7 +328,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);
@ -336,7 +336,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.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
View File

@ -314,7 +314,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);
@ -322,7 +322,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

@ -314,7 +314,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);
@ -322,7 +322,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/src/main/java/org/dynmap/fabric_1_17/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);