Fix fetching of prices of on-character implants

This commit is contained in:
DarkPhoenix
2019-04-16 16:25:44 +03:00
parent fd54d2c28c
commit e57fce39fe
7 changed files with 11 additions and 13 deletions

View File

@@ -485,20 +485,20 @@ class Fit(FitDeprecated):
return changedMods, changedProjMods, changedProjDrones
@classmethod
def fitObjectIter(cls, fit):
def fitObjectIter(cls, fit, forceFitImplants=False):
yield fit.ship
for mod in fit.modules:
if not mod.isEmpty:
yield mod
for container in (fit.drones, fit.fighters, fit.implants, fit.boosters, fit.cargo):
implants = fit.implants if forceFitImplants else fit.appliedImplants
for container in (fit.drones, fit.fighters, implants, fit.boosters, fit.cargo):
for obj in container:
yield obj
@classmethod
def fitItemIter(cls, fit):
for fitobj in cls.fitObjectIter(fit):
def fitItemIter(cls, fit, forceFitImplants=False):
for fitobj in cls.fitObjectIter(fit, forceFitImplants):
yield fitobj.item
charge = getattr(fitobj, 'charge', None)
if charge:

View File

@@ -165,7 +165,6 @@ class Price:
except Exception as e:
pyfalog.critical("Execution of callback from getPrices failed.")
pyfalog.critical(e)
db.commit()
if waitforthread: