Check threading on backup init.

This commit is contained in:
KHobbits 2013-04-13 23:10:01 +01:00
parent e353ec7f66
commit 7e80f440ca
2 changed files with 24 additions and 9 deletions

View File

@ -25,16 +25,33 @@ public class Backup implements Runnable
server = ess.getServer();
if (server.getOnlinePlayers().length > 0)
{
startTask();
ess.runTaskAsynchronously(new Runnable()
{
@Override
public void run()
{
startTask();
}
});
}
}
void onPlayerJoin()
public void onPlayerJoin()
{
startTask();
}
private void startTask()
public void cleanup()
{
running = false;
if (taskId != -1)
{
server.getScheduler().cancelTask(taskId);
}
taskId = -1;
}
private synchronized void startTask()
{
if (!running)
{
@ -61,7 +78,8 @@ public class Backup implements Runnable
{
return;
}
if ("save-all".equalsIgnoreCase(command)) {
if ("save-all".equalsIgnoreCase(command))
{
final CommandSender cs = server.getConsoleSender();
server.dispatchCommand(cs, "save-all");
active = false;
@ -123,11 +141,7 @@ public class Backup implements Runnable
server.dispatchCommand(cs, "save-on");
if (server.getOnlinePlayers().length == 0)
{
running = false;
if (taskId != -1)
{
server.getScheduler().cancelTask(taskId);
}
cleanup();
}
active = false;
LOGGER.log(Level.INFO, _("backupFinished"));

View File

@ -293,6 +293,7 @@ public class Essentials extends JavaPlugin implements IEssentials
}
cleanupOpenInventories();
i18n.onDisable();
backup.cleanup();
Economy.setEss(null);
Trade.closeLog();
}