Fix update step order so that player moves/attacks, then npcs attack/move