Living weapons vault fix

Fix for living weapons vault breaking generation if it tried to generate a whip. Also added a failsafe to prevent future broken generation