From 8656fd50cefa118f7561f17e16dc7495e4050dbc Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Fri, 31 Aug 2012 16:49:35 -0400
Subject: [PATCH] Also, make missing entity not blow things up

---
 client/cpw/mods/fml/client/FMLClientHandler.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java
index c3e3181ebe..dbd66c0c56 100644
--- a/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -350,9 +350,16 @@ public class FMLClientHandler implements IFMLSidedHandler
     public void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket packet)
     {
         Entity ent = client.field_71441_e.func_73024_a(packet.entityId);
-        ent.field_70118_ct = packet.serverX;
-        ent.field_70117_cu = packet.serverY;
-        ent.field_70116_cv = packet.serverZ;
+        if (ent != null)
+        {
+            ent.field_70118_ct = packet.serverX;
+            ent.field_70117_cu = packet.serverY;
+            ent.field_70116_cv = packet.serverZ;
+        }
+        else
+        {
+            FMLLog.fine("Attempted to adjust the position of entity %d which is not present on the client", packet.entityId);
+        }
     }
 
     @Override