diff --git a/src/main/java/net/minecraft/world/chunk/Chunk.java b/src/main/java/net/minecraft/world/chunk/Chunk.java
index 8399282..4953239 100644
--- a/src/main/java/net/minecraft/world/chunk/Chunk.java
+++ b/src/main/java/net/minecraft/world/chunk/Chunk.java
@@ -960,6 +960,12 @@
 
 		for (int i = 0; i < this.entityLists.length; ++i)
 		{
+			for(Iterator it = entityLists[i].iterator(); it.hasNext();)
+			{
+				Entity ent = (Entity)it.next();
+				if(ent.isEntityPlayerMP() || ent.isDead)
+					it.remove();
+			}
 			this.worldObj.unloadEntities(this.entityLists[i]);
 		}
 		MinecraftForge.EVENT_BUS.post(new ChunkEvent.Unload(this));