Merge branch 'mcMMO-Dev:master' into dev/sell-hand

ArmaRealms · Feb 20, 2024 · dcc4928 · dcc4928
2 parents 3a2bc0a + cdc187b
commit dcc4928
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -384,7 +384,8 @@ public void onDisable() {
             UserManager.saveAll();      // Make sure to save player information if the server shuts down
             UserManager.clearAll();
             Alchemy.finishAllBrews();   // Finish all partially complete AlchemyBrewTasks to prevent vanilla brewing continuation on restart
-            getPartyManager().saveParties(); // Save our parties
+            if(partyConfig.isPartyEnabled())
+                getPartyManager().saveParties(); // Save our parties
 
             //TODO: Needed?
             if(generalConfig.getScoreboardsEnabled())

diff --git a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java b/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java
@@ -20,7 +20,7 @@ public void run() {
             count++;
         }
 
-
-        mcMMO.p.getPartyManager().saveParties();
+        if(mcMMO.p.getPartyConfig().isPartyEnabled())
+            mcMMO.p.getPartyManager().saveParties();
     }
 }