From f63413e9656a7301d108eaf7c736230128c0d1b4 Mon Sep 17 00:00:00 2001 From: wsbrenk Date: Wed, 26 Apr 2023 22:40:08 +0200 Subject: [PATCH] #1856 fix currency of secondary teams --- build.gradle | 2 +- src/main/java/core/file/xml/ConvertXml2Hrf.java | 4 ++-- src/main/java/core/model/XtraData.java | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 995ecebc6..aca4827d2 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ test { // Development_stage (DEV:0 BETA:1 STABLE:2) def major = '7' def minor = '1' -def development_stage = 0 +def development_stage = 1 def releaseArtefacts = true def development_tag = ["dev", "beta", "tag_stable"] def version_type = ["-DEV", "-BETA", ""] diff --git a/src/main/java/core/file/xml/ConvertXml2Hrf.java b/src/main/java/core/file/xml/ConvertXml2Hrf.java index 328bc492c..19d6b3020 100644 --- a/src/main/java/core/file/xml/ConvertXml2Hrf.java +++ b/src/main/java/core/file/xml/ConvertXml2Hrf.java @@ -114,7 +114,7 @@ private ConvertXml2Hrf() { if ( lastPremierId != null && lastPremierId == usersPremierTeamId ){ //if (ModuleConfig.instance().containsKey("CurrencyRate")) { worldDataMap.put("CurrencyRate", ModuleConfig.instance().getString("CurrencyRate")); - worldDataMap.put("CountryId", ModuleConfig.instance().getString("CountryId")); + worldDataMap.put("CountryID", ModuleConfig.instance().getString("CountryId")); } else { // We need to get hold of the currency info for the primary team, no matter which team we download. usersPremierTeamInfo = XMLWorldDetailsParser.updateTeamInfoWithCurrency(usersPremierTeamInfo, mc.getWorldDetails(usersPremierTeamInfo.getLeagueId())); @@ -122,7 +122,7 @@ private ConvertXml2Hrf() { ModuleConfig.instance().setString("CountryId", usersPremierTeamInfo.getCountryId()); ModuleConfig.instance().setInteger("UsersPremierTeamId", usersPremierTeamInfo.getTeamId()); worldDataMap.put("CurrencyRate", ModuleConfig.instance().getString("CurrencyRate")); - worldDataMap.put("CountryId", ModuleConfig.instance().getString("CountryId")); + worldDataMap.put("CountryID", ModuleConfig.instance().getString("CountryId")); } HOMainFrame.instance().setInformation(Helper.getTranslation("ls.update_status.players_information"), progressIncrement); diff --git a/src/main/java/core/model/XtraData.java b/src/main/java/core/model/XtraData.java index b2f4d9d82..37ab0866e 100644 --- a/src/main/java/core/model/XtraData.java +++ b/src/main/java/core/model/XtraData.java @@ -14,6 +14,11 @@ public class XtraData extends AbstractTable.Storable { private HODateTime m_TrainingDate; private boolean m_bHasPromoted; private double m_dCurrencyRate = -1.0d; + + /** + * Id of the user's premier team + * (same currency with all teams of the user) + */ private Integer m_iCountryId; /**