From caf5b0a84166c598c6c6be64ec3e0dbbf81b485c Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sat, 10 Sep 2022 00:28:57 +0800
Subject: [PATCH] Fix: Loop when storage is full of equipments >= T2 or above

---
 module/storage/storage.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/module/storage/storage.py b/module/storage/storage.py
index 183eb6950..126891ff9 100644
--- a/module/storage/storage.py
+++ b/module/storage/storage.py
@@ -324,6 +324,7 @@ class StorageHandler(StorageUI):
             disassembled += equip
             if equip <= 0:
                 logger.info('No more equipment to disassemble, going to use boxes')
+                boxes = 0
                 try:
                     self._storage_enter_material()
                     boxes = self._storage_use_box_execute(rarity=rarity, amount=amount - disassembled)
@@ -332,7 +333,13 @@ class StorageHandler(StorageUI):
                         self.storage_has_boxes = False
                         break
                 except StorageFull:
-                    pass
+                    if boxes <= 0:
+                        logger.warning('Unable to use boxes because storage full, '
+                                       'probably because storage is full of rare equipments or above, '
+                                       'disassemble equipment end')
+                        logger.warning('Please manually disassemble some equipments to free up storage')
+                        self.storage_has_boxes = False
+                        break
 
         return disassembled
 
@@ -368,16 +375,23 @@ class StorageHandler(StorageUI):
                 logger.info('Reached total target amount, stop')
                 break
 
+            boxes = 0
             try:
                 self._storage_enter_material()
                 boxes = self._storage_use_box_execute(rarity=rarity, amount=amount - used)
                 used += boxes
                 if boxes <= 0:
-                    logger.warning('No more boxes to use, disassemble equipment end')
+                    logger.warning('No more boxes to use, use boxes end')
                     self.storage_has_boxes = False
                     break
             except StorageFull:
-                continue
+                if boxes <= 0:
+                    logger.warning('Unable to use boxes because storage full, '
+                                   'probably because storage is full of rare equipments or above, '
+                                   'use boxes end')
+                    logger.warning('Please manually disassemble some equipments to free up storage')
+                    self.storage_has_boxes = False
+                    break
 
         return used