From 42c750862fa14597b3445dea6f2e0d44b59de0ad Mon Sep 17 00:00:00 2001
From: Jack Lin <jacklin213@gmail.com>
Date: Tue, 30 Jun 2015 01:39:04 +1200
Subject: [PATCH] Fix NPE in OctopusForm

---
 .../projectkorra/ProjectKorra/waterbending/OctopusForm.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java b/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
index f129b416..02bda24a 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
@@ -227,8 +227,9 @@ public class OctopusForm {
 					sourcelocation.add(vector);
 					Block newblock = sourcelocation.getBlock();
 					if (!newblock.equals(sourceblock)) {
-						source.revertBlock();
-						source = null;
+						if (source != null) {
+							source.revertBlock();
+						}
 						if (!GeneralMethods.isSolid(newblock)) {
 							source = new TempBlock(newblock, Material.STATIONARY_WATER, (byte) 8);
 							sourceblock = newblock;