Fixed Blacksmith again

i hope
Merge remote-tracking branch 'origin/master' into BranDev-Branch
Fixed inventory thingy for Johnny
I hate my life

fixed getItems() again
Merge remote-tracking branch 'origin/master' into JohnDev-Branch