From 946b5bb006ab33f3c4adbb9f62e2e5df39d7ed8e Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Tue, 3 Jul 2012 07:59:15 -0400
Subject: [PATCH] Added null checks to BlockBreak & BlockDamage events to help
 with mod compatibility.

---
 .../gmail/nossr50/listeners/BlockListener.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
index 400e41ce4..b41505e1e 100644
--- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -153,18 +153,23 @@ public class BlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
+        if (event instanceof FakeBlockBreakEvent) {
+            return;
+        }
+
         Player player = event.getPlayer();
         PlayerProfile PP = Users.getProfile(player);
+
+        if (PP == null) {
+            return;
+        }
+
         Block block = event.getBlock();
         ItemStack inHand = player.getItemInHand();
 
         Config configInstance = Config.getInstance();
         Permissions permInstance = Permissions.getInstance();
 
-        if (event instanceof FakeBlockBreakEvent) {
-            return;
-        }
-
         /* HERBALISM */
         if (BlockChecks.canBeGreenTerra(block)) {
             /* Green Terra */
@@ -264,6 +269,11 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
         PlayerProfile PP = Users.getProfile(player);
+
+        if (PP == null) {
+            return;
+        }
+
         ItemStack inHand = player.getItemInHand();
         Block block = event.getBlock();
         Material material = block.getType();