Fix player location restore and inventory protect