Fixed both instances of possible softlock

It was a rare occurrence because the player had to get two exact rolls to make these soft locks happen, but this update should fix it.

Author: phellen007