From 3d2676a9995e0c42a59f296722ae24734da88355 Mon Sep 17 00:00:00 2001
From: jedk1 <jedkristian@live.com>
Date: Sat, 20 Feb 2016 17:36:22 +0000
Subject: [PATCH] Fix ChiCombo NPE and FallDamage

---
 src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java b/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java
index c64fa61a..fec423e3 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java
@@ -55,7 +55,9 @@ public class ChiCombo extends ChiAbility implements ComboAbility {
 	 * @param duration The time in milliseconds the target will be paralyzed
 	 */
 	private static void paralyze(Entity target, Long duration) {
-		PARALYZED_ENTITIES.put(target, (System.currentTimeMillis() + duration));
+		if (target != null) {
+			PARALYZED_ENTITIES.put(target, (System.currentTimeMillis() + duration));
+		}
 	}
 
 	/**
@@ -86,6 +88,7 @@ public class ChiCombo extends ChiAbility implements ComboAbility {
 	 */
 	public static void handleParalysis() {
 		for (Entity entity : PARALYZED_ENTITIES.keySet()) {
+			entity.setFallDistance(0);
 			if (PARALYZED_ENTITIES.get(entity) <= System.currentTimeMillis()) {
 				PARALYZED_ENTITIES.remove(entity);