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

Merge pull request #3421 from Bond-009/nullref

Browse Source 
Fix possible nullref
This commit is contained in:
mikeprimm 2021-07-14 14:25:16 -05:00 committed by GitHub
commit d8d41eb39b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/DynmapPlugin.java
View File

@ -179,7 +179,7 @@ public class DynmapPlugin {
int idx = bsids.getId(bs);
if (idx >= stateByID.length) {
int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
}
Block b = bs.getBlock();
@ -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);

6
fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/DynmapPlugin.java
View File

@ -179,7 +179,7 @@ public class DynmapPlugin {
int idx = bsids.getId(bs);
if (idx >= stateByID.length) {
int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
}
Block b = bs.getBlock();
@ -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);

6
fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin {
int idx = bsids.getId(bs);
if (idx >= stateByID.length) {
int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
}
Block b = bs.getBlock();
@ -328,7 +328,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);
@ -336,7 +336,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);

6
fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin {
int idx = bsids.getRawId(bs);
if (idx >= stateByID.length) {
int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
}
Block b = bs.getBlock();
@ -314,7 +314,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);
@ -322,7 +322,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);

6
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/DynmapPlugin.java
View File

@ -177,7 +177,7 @@ public class DynmapPlugin {
int idx = bsids.getRawId(bs);
if (idx >= stateByID.length) {
int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
}
Block b = bs.getBlock();
@ -314,7 +314,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);
@ -322,7 +322,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);

6
fabric-1.17/src/main/java/org/dynmap/fabric_1_17/DynmapPlugin.java
View File

@ -178,7 +178,7 @@ public class DynmapPlugin {
int idx = bsids.getRawId(bs);
if (idx >= stateByID.length) {
int plen = stateByID.length;
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
stateByID = Arrays.copyOf(stateByID, idx*11/10); // grow array by 10%
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
}
Block b = bs.getBlock();
@ -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);