Merge remote-tracking branch 'refs/remotes/R4stl1n/master'

This commit is contained in:
Brett Costabile 2015-11-19 00:34:09 -05:00
commit 383d89a0a5

View File

@ -428,12 +428,27 @@ def run_corp_update():
# Remove irrelevent corp and alliance models
# Check the corps
for all_corp_info in EveManager.get_all_corporation_info():
if (settings.IS_CORP and all_corp_info.corporation_id != settings.CORP_ID) or (not settings.IS_CORP and all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID):
if settings.IS_CORP:
if all_corp_info.corporation_id != settings.CORP_ID:
if not all_corp_info.is_blue:
all_corp_info.delete()
else:
if all_corp_info.alliance is not None:
if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID:
if not all_corp_info.is_blue:
all_corp_info.delete()
elif not all_corp_info.is_blue:
all_corp_info.delete()
# Check the alliances
for all_alliance_info in EveManager.get_all_alliance_info():
if (not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID):
if settings.IS_CORP:
if all_alliance_info.is_blue is not True:
if corpinfo.alliance is not None:
if all_alliance_info.alliance_id != corpinfo.alliance.alliance_id:
all_alliance_info.delete()
else:
all_alliance_info.delete()
elif all_alliance_info.alliance_id != settings.ALLIANCE_ID:
if all_alliance_info.is_blue is not True:
all_alliance_info.delete()