Different fixes for ServerTick timing issues brought up by #1081.  Everything SHOULD work, but I couldn't test grave protection on my own, and nothing currently uses Questioner.  Closes #1082