Fix some deprecated things and a bug or two

2017-07-02 23:08:02 -04:00
parent de5a734919
commit 7ae41b71b2
6 changed files with 35 additions and 32 deletions
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -339,7 +339,7 @@ class Skill(HandledItem):
        elif self.character.name == "All 0":
            self.activeLevel = self.__level = 0
        elif self.character.alphaClone:
-            return min(self.activeLevel, self.character.alphaClone.getSkillLevel(self)) or 0
+            return min(self.activeLevel or 0, self.character.alphaClone.getSkillLevel(self) or 0)

        return self.activeLevel or 0