Fix IntellectualSites#1386

Signed-off-by: MattBDev <[email protected]>
SimplyServers · Oct 10, 2016 · a05fd2d · a05fd2d
1 parent 5978c9c
commit a05fd2d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
@@ -59,8 +59,11 @@ public abstract class EventUtil {
     public abstract void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added);
 
     public void doJoinTask(final PlotPlayer player) {
+        if (player == null) {
+            return; //possible future warning message to figure out where we are retrieving null
+        }
         if (ExpireManager.IMP != null) {
-            ExpireManager.IMP.handleJoin(player);
+                ExpireManager.IMP.handleJoin(player);
         }
         if (PS.get().worldedit != null) {
             if (player.getAttribute("worldedit")) {