From d1d60910614fc489e4723f5aa4c10a61bf7a1a30 Mon Sep 17 00:00:00 2001
From: jedk1 <jedkristian@live.com>
Date: Tue, 1 Dec 2015 00:49:51 +0000
Subject: [PATCH] Fix NPE on update

---
 .../projectkorra/object/HorizontalVelocityTracker.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java b/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
index 9b1a1b68..fbef8570 100644
--- a/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
+++ b/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
@@ -102,7 +102,11 @@ public class HorizontalVelocityTracker {
 
 	public static void updateAll() {
 		for (Entity e : instances.keySet())
-			instances.get(e).update();
+			if (e != null) {
+				instances.get(e).update();
+			} else {
+				instances.remove(e);
+			}
 	}
 
 	public void remove() {