From f9d982934ce44cd8a7fbd9f19943edb149a8e6c1 Mon Sep 17 00:00:00 2001
From: Major- <major@emulate.rs>
Date: Sat, 8 Mar 2014 12:46:55 +0000
Subject: [PATCH] Fix bug when removing an entity from a sector.

---
 src/org/apollo/game/model/sector/Sector.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/org/apollo/game/model/sector/Sector.java b/src/org/apollo/game/model/sector/Sector.java
index 7f8901d7..b92b7ea5 100644
--- a/src/org/apollo/game/model/sector/Sector.java
+++ b/src/org/apollo/game/model/sector/Sector.java
@@ -145,6 +145,11 @@ public final class Sector {
 	 */
 	public boolean removeEntity(Entity entity) {
 		List<Entity> entities = this.entities.get(entity.getPosition());
+		if (entities == null) {
+			this.entities.put(entity.getPosition(), new ArrayList<Entity>());
+			return false;
+		}
+
 		if (entities.remove(entity)) {
 			notifyListeners(entity);
 			return true;