From 6b03c92cfb2e0fdb11a71c1453b30fc5df8a4c03 Mon Sep 17 00:00:00 2001
From: jack lin <jacklin213@gmail.com>
Date: Sat, 30 Aug 2014 21:48:27 +1200
Subject: [PATCH] [BUGFIX] Fixed NPE in IceSpike

* Error:
http://www.projectkorra.com/threads/errorstacks-cause-pastebin-deletes.361/#post-3089
---
 .../ProjectKorra/waterbending/IceSpike.java           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/waterbending/IceSpike.java b/src/com/projectkorra/ProjectKorra/waterbending/IceSpike.java
index 7fb26a9c..d7322166 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/IceSpike.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/IceSpike.java
@@ -187,13 +187,14 @@ public class IceSpike {
 				moveEarth();
 				removeTimers.put(player, System.currentTimeMillis());
 			} else {
-				if (removeTimers.get(player) + removeTimer <= System.currentTimeMillis()) {
-					baseblocks.put(location.clone().add(direction.clone().multiply(-1 * (height))).getBlock(),(height - 1));
-					if (!revertblocks()) {
-						instances.remove(id);
+				if (removeTimers.contains(player)) {
+					if (removeTimers.get(player) + removeTimer <= System.currentTimeMillis()) {
+						baseblocks.put(location.clone().add(direction.clone().multiply(-1 * (height))).getBlock(),(height - 1));
+						if (!revertblocks()) {
+							instances.remove(id);
+						}
 					}
 				}
-
 				return false;
 			}
 		}