 --- ../src-base/minecraft/net/minecraft/network/NetHandlerPlayServer.java
 +++ ../src-work/minecraft/net/minecraft/network/NetHandlerPlayServer.java
-@@ -612,7 +612,10 @@
+@@ -159,6 +159,7 @@
+ 
+     public void update()
+     {
++        if (this.playerEntity.playerNetServerHandler != this) return; // FORGE: sometimes the netqueue will tick while login is occuring, causing an NPE. We shouldn't tick until the connection is complete
+         this.func_184342_d();
+         this.playerEntity.onUpdateEntity();
+         this.playerEntity.setPositionAndRotation(this.field_184349_l, this.field_184350_m, this.field_184351_n, this.playerEntity.rotationYaw, this.playerEntity.rotationPitch);
+@@ -612,7 +613,10 @@
                  double d2 = this.playerEntity.posZ - ((double)blockpos.getZ() + 0.5D);
                  double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  

             itemstack = null;
         }
     }
@@ -703,12 +709,14 @@
 
         if (itemstack != null)
         {

                 itemstack = null;
             }
         }
@@ -888,7 +897,9 @@
             }
             else
             {
