فهرست منبع

Fix PartySaving related NPEs (only save parties if they're enabled) (#4973)

Co-authored-by: Dieu <info@l4b.org>
IAISI 1 سال پیش
والد
کامیت
cdc187b211
2فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 2 1
      src/main/java/com/gmail/nossr50/mcMMO.java
  2. 2 2
      src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java

+ 2 - 1
src/main/java/com/gmail/nossr50/mcMMO.java

@@ -384,7 +384,8 @@ public class mcMMO extends JavaPlugin {
             UserManager.saveAll();      // Make sure to save player information if the server shuts down
             UserManager.saveAll();      // Make sure to save player information if the server shuts down
             UserManager.clearAll();
             UserManager.clearAll();
             Alchemy.finishAllBrews();   // Finish all partially complete AlchemyBrewTasks to prevent vanilla brewing continuation on restart
             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?
             //TODO: Needed?
             if(generalConfig.getScoreboardsEnabled())
             if(generalConfig.getScoreboardsEnabled())

+ 2 - 2
src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java

@@ -20,7 +20,7 @@ public class SaveTimerTask extends CancellableRunnable {
             count++;
             count++;
         }
         }
 
 
-
-        mcMMO.p.getPartyManager().saveParties();
+        if(mcMMO.p.getPartyConfig().isPartyEnabled())
+            mcMMO.p.getPartyManager().saveParties();
     }
     }
 }
 }