dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Fix #106

Browse Source
This commit is contained in:
blitzmann
2014-05-27 19:35:51 -04:00
parent f1f9da9214
commit 749934b89d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eos/saveddata/module.py
View File

@@ -564,9 +564,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
#1: It makes sense to run the effect #1: It makes sense to run the effect
# The effect is either offline # The effect is either offline
# or the effect is passive and the module is in the online state (or higher) # or the effect is passive and the module is in the online state (or higher)
# or the effect is active and the module is in the active state (or higher) # or the effect is active and the module is in the active state (or higher)
# or the effect is overheat and the module is in the overheated state (or higher) # or the effect is overheat and the module is in the overheated state (or higher)
#2: the runtimes match #2: the runtimes match
if self.projected or forceProjected: if self.projected or forceProjected:
context = "projected", "module" context = "projected", "module"
projected = True projected = True
@@ -575,9 +577,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
projected = False projected = False
if self.charge is not None: if self.charge is not None:
for effect in self.charge.effects.itervalues(): # fix for #82 and it's regression #106
if effect.runTime == runTime: if not projected or (self.projected and not forceProjected):
effect.handler(fit, self, ("moduleCharge",)) for effect in self.charge.effects.itervalues():
if effect.runTime == runTime:
effect.handler(fit, self, ("moduleCharge",))
if self.item: if self.item:
if self.state >= State.OVERHEATED: if self.state >= State.OVERHEATED: