Fix stronghold crash on MCPC+

My attempt at fixing issues #153 and #155.