Make world saving control more safe

Potential memory leak with the previous world saving control patch.
Removed that and instead added a world session lock control patch.