From 19565e90ff0935670962fbba9ef8f30b266a4657 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sat, 14 Nov 2020 12:02:48 -0800
Subject: [PATCH] Added null checks

---
 .../java/world/bentobox/limits/listeners/JoinListener.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/world/bentobox/limits/listeners/JoinListener.java b/src/main/java/world/bentobox/limits/listeners/JoinListener.java
index e0c0c17..76cbc0d 100644
--- a/src/main/java/world/bentobox/limits/listeners/JoinListener.java
+++ b/src/main/java/world/bentobox/limits/listeners/JoinListener.java
@@ -115,10 +115,10 @@ public class JoinListener implements Listener {
                 // 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));
                 }