From cc092a9ae87f9eb33bc302e829c35897bae4fcfa Mon Sep 17 00:00:00 2001
From: nathank33 <nathanbraunguitar@gmail.com>
Date: Thu, 4 Sep 2014 18:02:45 -0700
Subject: [PATCH] WaterSpout No Fall Damage NPE Fix

---
 src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java
index a69fc6fe..74126032 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterSpout.java
@@ -45,6 +45,8 @@ public class WaterSpout {
 		}
 		this.player = player;
 		Block topBlock = Methods.getTopBlock(player.getLocation(), 0, -50);
+		if(topBlock == null)
+			return;
 		Material mat = topBlock.getType();
 		if(mat != Material.WATER && mat != Material.STATIONARY_WATER
 				&& mat != Material.ICE && mat != Material.PACKED_ICE && mat != Material.SNOW)