Fixes get and set armour
Merge pull request #2223 from Falkirks/set-armour-fix

Fix various get and set armour in PlayerInventory