Rework on "Custom : Can't PVE without buff."

This rework the commit 4a212443e89b188d88ece0ccae4a302cb3ddcc3f.