[Fixed] players sometimes not being able to create a new vendor

Change-Id: I0e00fa1e893d837d09ddad9d54bf226512cf03ae
Merge "[Fixed] players sometimes not being able to create a new vendor" into unstable