Added null checks

BentoBoxWorld · Nov 14, 2020 · 19565e9 · 19565e9
1 parent c0c9e16
commit 19565e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/limits/listeners/JoinListener.java b/src/main/java/world/bentobox/limits/listeners/JoinListener.java
@@ -115,10 +115,10 @@ private void checkPerms(Player player, String permissionPrefix, String islandId,
                 // Material limit
                 ibc.setBlockLimit(m, Math.max(ibc.getBlockLimit(m), value));
             } else {
-                if (m.isBlock()) {
+                if (m != null && m.isBlock()) {
                     // Material limit
                     ibc.setBlockLimit(m, Math.max(ibc.getBlockLimit(m), value));
-                } else {
+                } else if (et != null){
                     // This is an entity setting
                     ibc.setEntityLimit(et, Math.max(ibc.getEntityLimit(et), value));
                 }