ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-05 09:53:33 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1316 from EDCD/fix/1018/update-and-docked-status

Browse Source 
CAPI: Avoid '... EDO Settlement?' for 'Update' in space
This commit is contained in:
Athanasius 2021-10-20 15:05:28 +01:00 committed by GitHub
commit 8d55e9f02c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
EDMarketConnector.py
View File

@ -1072,25 +1072,14 @@ class AppWindow(object):
f"{monitor.state['OnFoot']!r} and {monitor.station!r}") f"{monitor.state['OnFoot']!r} and {monitor.station!r}")
raise companion.ServerLagging() raise companion.ServerLagging()
else: elif capi_response.capi_data['commander']['docked'] and monitor.station is None:
last_station = None
if capi_response.capi_data['commander']['docked']:
last_station = capi_response.capi_data['lastStarport']['name']
if monitor.station is None:
# Likely (re-)Embarked on ship docked at an EDO settlement. # Likely (re-)Embarked on ship docked at an EDO settlement.
# Both Disembark and Embark have `"Onstation": false` in Journal. # Both Disembark and Embark have `"Onstation": false` in Journal.
# So there's nothing to tell us which settlement we're (still, # So there's nothing to tell us which settlement we're (still,
# or now, if we came here in Apex and then recalled ship) docked at. # or now, if we came here in Apex and then recalled ship) docked at.
logger.debug("monitor.station is None - so EDO settlement?") logger.debug("docked AND monitor.station is None - so EDO settlement?")
raise companion.NoMonitorStation() raise companion.NoMonitorStation()
if last_station != monitor.station:
# CAPI lastStarport must match
logger.warning(f"({capi_response.capi_data['lastStarport']['name']!r} != {monitor.station!r})"
f" AND {last_station!r} != {monitor.station!r}")
raise companion.ServerLagging()
self.capi_query_holdoff_time = capi_response.query_time + companion.capi_query_cooldown self.capi_query_holdoff_time = capi_response.query_time + companion.capi_query_cooldown
elif not monitor.state['OnFoot'] and capi_response.capi_data['ship']['id'] != monitor.state['ShipID']: elif not monitor.state['OnFoot'] and capi_response.capi_data['ship']['id'] != monitor.state['ShipID']: