From c8fb0582b2c3c1361ced3c65b2fa5d1c58e9739f Mon Sep 17 00:00:00 2001
From: LLCoolDave <llcooldave@gmail.com>
Date: Mon, 17 Jul 2017 23:14:31 +0200
Subject: [PATCH] all_state now only considers unplaced itempool items and
 sweeps. This gives an accurate depiction of what would be possible from this
 point on.

---
 BaseClasses.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 7f34035d..02cb3273 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -87,8 +87,6 @@ class World(object):
         ret = CollectionState(self)
         
         def soft_collect(item):
-            if 'Crystal' in item.name or 'Pendant' in item.name:
-                return
             if item.name.startswith('Progressive '):
                 if 'Sword' in item.name:
                     if ret.has('Golden Sword'):
@@ -112,10 +110,10 @@ class World(object):
             elif item.advancement:
                 ret.prog_items.append(item.name)
 
-        for location in self.get_filled_locations():
-            soft_collect(location.item)
         for item in self.itempool:
             soft_collect(item)
+        ret.sweep_for_events()
+        ret._clear_cache()
         return ret
 
     def find_items(self, item):