Merge pull request MegaMek#3796 from SJuliez/quirks_adaptation

Moving Quirks to unit files: adapt MHQ to MM changes
Thom293 · Dec 13, 2023 · a98ed05 · a98ed05
2 parents 5b4f192 + 9e61c5f
commit a98ed05
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
@@ -310,13 +310,6 @@ public void requestStop() {
         } catch (IOException e) {
             LogManager.getLogger().error("Error saving custom weapon orders!", e);
         }
-
-        try {
-            QuirksHandler.saveCustomQuirksList();
-        } catch (Exception e) {
-            LogManager.getLogger().error("Error saving quirks override!", e);
-        }
-
         stop = true;
     }
 

diff --git a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
@@ -22,7 +22,6 @@
 import megamek.client.generator.RandomNameGenerator;
 import megamek.client.ui.swing.util.UIUtil;
 import megamek.common.MechSummaryCache;
-import megamek.common.QuirksHandler;
 import megamek.common.annotations.Nullable;
 import megamek.common.options.OptionsConstants;
 import mekhq.MHQStaticDirectoryManager;
@@ -242,8 +241,6 @@ public Campaign doInBackground() throws Exception {
 
             //region Progress 5
             setProgress(5);
-            QuirksHandler.initQuirksList();
-
             while (!MechSummaryCache.getInstance().isInitialized()) {
                 try {
                     Thread.sleep(50);