Added the check in more places
Hotfix for equipment-related crash issue

Persisted player equipment objects were not managed at all by the
objectservice collection upon reload leading to inconsistencies.
Merge pull request #1237 from CharonInferar/ObjectServiceFix

 Hotfix for equipment-related crash issue