From d930c78d16c688fbd494ac7c8c16bfbea55dd766 Mon Sep 17 00:00:00 2001
From: jedk1 <jedkristian@live.com>
Date: Sun, 17 Apr 2016 14:37:15 +0100
Subject: [PATCH] Fix NPE in blocksource

---
 src/com/projectkorra/projectkorra/util/BlockSource.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/util/BlockSource.java b/src/com/projectkorra/projectkorra/util/BlockSource.java
index 9e5590b3..5aec9b84 100644
--- a/src/com/projectkorra/projectkorra/util/BlockSource.java
+++ b/src/com/projectkorra/projectkorra/util/BlockSource.java
@@ -156,10 +156,13 @@ public class BlockSource {
 	 */
 	public static Block getSourceBlock(Player player, double range, BlockSourceType sourceType, ClickType clickType) {
 		BlockSourceInformation info = getValidBlockSourceInformation(player, range, sourceType, clickType);
-		if (TempBlock.isTempBlock(info.getBlock())) {
-			return null;
+		if (info != null) {
+			if (TempBlock.isTempBlock(info.getBlock())) {
+				return null;
+			}
+			return info.getBlock();
 		}
-		return info != null ? info.getBlock() : null;
+		return null;
 	}
 
 	/**