Finally fixed EntityUpdates + continuing PVP work