SpigotMC
/
Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made SaveTask routine's repeat rate configurable through new setting "saveToFileEveryXMinutes" (default 30.0, as it was previously hardcoded). Routine can be disabled by setting it to 0 or lower. 

Also added in flag to make sure the routine doesn't try to run more than one iteration simultaneously if a previous iteration is still running.
This commit is contained in:
Brettflan 2013-04-18 03:02:40 -05:00
parent 7224734e17
commit f7d57efe0b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/Conf.java
View File

@ -71,6 +71,8 @@ public class Conf
public static boolean broadcastDescriptionChanges = false; public static boolean broadcastDescriptionChanges = false;
public static double saveToFileEveryXMinutes = 30.0;
public static double autoLeaveAfterDaysOfInactivity = 10.0; public static double autoLeaveAfterDaysOfInactivity = 10.0;
public static double autoLeaveRoutineRunsEveryXMinutes = 5.0; public static double autoLeaveRoutineRunsEveryXMinutes = 5.0;
public static boolean removePlayerDataWhenBanned = true; public static boolean removePlayerDataWhenBanned = true;

6
src/com/massivecraft/factions/zcore/MPlugin.java
View File

@ -20,6 +20,8 @@ import com.massivecraft.factions.zcore.util.PermUtil;
import com.massivecraft.factions.zcore.util.Persist; import com.massivecraft.factions.zcore.util.Persist;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;
import com.massivecraft.factions.Conf;
public abstract class MPlugin extends JavaPlugin public abstract class MPlugin extends JavaPlugin
{ {
@ -88,9 +90,9 @@ public abstract class MPlugin extends JavaPlugin
// Register recurring tasks // Register recurring tasks
long saveTicks = 20 * 60 * 30; // Approximately every 30 min if (saveTask == null && Conf.saveToFileEveryXMinutes > 0.0)
if (saveTask == null)
{ {
long saveTicks = (long)(20 * 60 * Conf.saveToFileEveryXMinutes); // Approximately every 30 min by default
saveTask = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new SaveTask(this), saveTicks, saveTicks); saveTask = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new SaveTask(this), saveTicks, saveTicks);
} }

6
src/com/massivecraft/factions/zcore/persist/SaveTask.java
View File

@ -4,6 +4,8 @@ import com.massivecraft.factions.zcore.MPlugin;
public class SaveTask implements Runnable public class SaveTask implements Runnable
{ {
static private boolean running = false;
MPlugin p; MPlugin p;
public SaveTask(MPlugin p) public SaveTask(MPlugin p)
{ {
@ -12,9 +14,11 @@ public class SaveTask implements Runnable
public void run() public void run()
{ {
if ( ! p.getAutoSave()) return; if ( ! p.getAutoSave() || running) return;
running = true;
p.preAutoSave(); p.preAutoSave();
EM.saveAllToDisc(); EM.saveAllToDisc();
p.postAutoSave(); p.postAutoSave();
running = false;
} }
} }