If plugin failed to load correctly for various reasons, it could end up wiping the board or faction list. This should now be prevented.

An example: if you loaded 1.6.6 (not 1.6.6b) on CB 1.1-R6 or newer, it would trigger an exception at startup and cause this problem.
This commit is contained in:
Brettflan 2012-03-09 14:44:17 -06:00
parent 54b97651b6
commit 0a048d6553
2 changed files with 15 additions and 5 deletions

View File

@ -78,7 +78,8 @@ public class P extends MPlugin
public void onEnable() public void onEnable()
{ {
if ( ! preEnable()) return; if ( ! preEnable()) return;
this.loadSuccessful = false;
// Load Conf from disk // Load Conf from disk
Conf.load(); Conf.load();
FPlayers.i.loadFromDisc(); FPlayers.i.loadFromDisc();
@ -112,6 +113,7 @@ public class P extends MPlugin
getServer().getPluginManager().registerEvents(serverListener, this); getServer().getPluginManager().registerEvents(serverListener, this);
postEnable(); postEnable();
this.loadSuccessful = true;
} }
@Override @Override
@ -133,8 +135,12 @@ public class P extends MPlugin
@Override @Override
public void onDisable() public void onDisable()
{ {
Board.save(); // only save data if plugin actually completely loaded successfully
Conf.save(); if (this.loadSuccessful)
{
Board.save();
Conf.save();
}
EssentialsFeatures.unhookChat(); EssentialsFeatures.unhookChat();
if (AutoLeaveTask != null) if (AutoLeaveTask != null)
{ {

View File

@ -34,6 +34,7 @@ public abstract class MPlugin extends JavaPlugin
public Gson gson; public Gson gson;
private Integer saveTask = null; private Integer saveTask = null;
private boolean autoSave = true; private boolean autoSave = true;
protected boolean loadSuccessful = false;
public boolean getAutoSave() {return this.autoSave;} public boolean getAutoSave() {return this.autoSave;}
public void setAutoSave(boolean val) {this.autoSave = val;} public void setAutoSave(boolean val) {this.autoSave = val;}
@ -81,7 +82,8 @@ public abstract class MPlugin extends JavaPlugin
{ {
saveTask = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new SaveTask(this), saveTicks, saveTicks); saveTask = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new SaveTask(this), saveTicks, saveTicks);
} }
loadSuccessful = true;
return true; return true;
} }
@ -97,7 +99,9 @@ public abstract class MPlugin extends JavaPlugin
this.getServer().getScheduler().cancelTask(saveTask); this.getServer().getScheduler().cancelTask(saveTask);
saveTask = null; saveTask = null;
} }
EM.saveAllToDisc(); // only save data if plugin actually loaded successfully
if (loadSuccessful)
EM.saveAllToDisc();
log("Disabled"); log("Disabled");
} }