Merged in DR v0.5.1.2

2021-09-17 11:12:05 -05:00
parent e8ef3bfc9b 1eda6cfa9a
commit ecacba55a4
12 changed files with 157 additions and 105 deletions
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1355,6 +1355,8 @@ class CollectionState(object):
    def collect(self, item, event=False, location=None):
        if location:
            self.locations_checked.add(location)
+        if not item:
+            return
        changed = False
        if item.name.startswith('Progressive '):
            if 'Sword' in item.name: