From 4325ccab8ab57abbfb7d58823118a9b797f36fba Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 3 Dec 2015 22:04:59 -0500 Subject: [PATCH] Different fix for #397 and fix #458 --- eos/modifiedAttributeDict.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index 203a1d99a..ed331ae6a 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -292,6 +292,9 @@ class ModifiedAttributeDict(collections.MutableMapping): def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGroup="default", skill=None): """Multiply value of given attribute by given factor""" + if multiplier is None: # See GH issue 397 + return + if skill: multiplier *= self.__handleSkill(skill) @@ -308,7 +311,7 @@ class ModifiedAttributeDict(collections.MutableMapping): else: if not attributeName in self.__multipliers: self.__multipliers[attributeName] = 1 - self.__multipliers[attributeName] *= multiplier if multiplier is not None else 1 + self.__multipliers[attributeName] *= multiplier self.__placehold(attributeName) self.__afflict(attributeName, "%s*" % ("s" if stackingPenalties else ""), multiplier, multiplier != 1)