Merge pull request #103 from HoverEpic/entityCache-improvments

fix NPE when getting an not cached entity in cache
DragonetMC · Dec 11, 2017 · 9ce437c · 9ce437c
2 parents f0cdf76 + 99ddda4
commit 9ce437c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/proxy/src/main/java/org/dragonet/proxy/network/cache/EntityCache.java b/proxy/src/main/java/org/dragonet/proxy/network/cache/EntityCache.java
@@ -67,6 +67,10 @@ public CachedEntity getClientEntity() {
 	}
 
 	public CachedEntity getByRemoteEID(long eid) {
+            if (!mapRemoteToClient.containsKey(eid))
+            {
+                return null;
+            }
 		long proxyEid = mapRemoteToClient.get(eid);
 		return entities.get(proxyEid);
 	}