Fixed database migration breakage.
Having to do with the new *.ignore files.
This commit is contained in:
parent
136033c1a1
commit
d425f6736a
|
|
@ -1335,7 +1335,7 @@ public abstract class DataStore
|
||||||
this.addDefault(defaults, Messages.UnSeparateConfirmation, "Those players will no longer ignore each other in chat.", null);
|
this.addDefault(defaults, Messages.UnSeparateConfirmation, "Those players will no longer ignore each other in chat.", null);
|
||||||
this.addDefault(defaults, Messages.NotIgnoringAnyone, "You're not ignoring anyone.", null);
|
this.addDefault(defaults, Messages.NotIgnoringAnyone, "You're not ignoring anyone.", null);
|
||||||
this.addDefault(defaults, Messages.TrustListHeader, "Explicit permissions here:", null);
|
this.addDefault(defaults, Messages.TrustListHeader, "Explicit permissions here:", null);
|
||||||
this.addDefault(defaults, Messages.Manage, "Manage.", null);
|
this.addDefault(defaults, Messages.Manage, "Manage", null);
|
||||||
this.addDefault(defaults, Messages.Build, "Build", null);
|
this.addDefault(defaults, Messages.Build, "Build", null);
|
||||||
this.addDefault(defaults, Messages.Containers, "Containers", null);
|
this.addDefault(defaults, Messages.Containers, "Containers", null);
|
||||||
this.addDefault(defaults, Messages.Access, "Access", null);
|
this.addDefault(defaults, Messages.Access, "Access", null);
|
||||||
|
|
|
||||||
|
|
@ -699,8 +699,9 @@ public class FlatFileDataStore extends DataStore
|
||||||
//all group data files start with a dollar sign. ignoring those, already handled above
|
//all group data files start with a dollar sign. ignoring those, already handled above
|
||||||
if(file.getName().startsWith("$")) continue;
|
if(file.getName().startsWith("$")) continue;
|
||||||
|
|
||||||
//ignore special files (claimID)
|
//ignore special files
|
||||||
if(file.getName().startsWith("_")) continue;
|
if(file.getName().startsWith("_")) continue;
|
||||||
|
if(file.getName().endsWith(".ignore")) continue;
|
||||||
|
|
||||||
UUID playerID = UUID.fromString(file.getName());
|
UUID playerID = UUID.fromString(file.getName());
|
||||||
databaseStore.savePlayerData(playerID, this.getPlayerData(playerID));
|
databaseStore.savePlayerData(playerID, this.getPlayerData(playerID));
|
||||||
|
|
|
||||||
|
|
@ -247,7 +247,6 @@ public class GriefPrevention extends JavaPlugin
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
GriefPrevention.AddLogEntry("Because there was a problem with the database, GriefPrevention will not function properly. Either update the database config settings resolve the issue, or delete those lines from your config.yml so that GriefPrevention can use the file system to store data.");
|
GriefPrevention.AddLogEntry("Because there was a problem with the database, GriefPrevention will not function properly. Either update the database config settings resolve the issue, or delete those lines from your config.yml so that GriefPrevention can use the file system to store data.");
|
||||||
GriefPrevention.AddLogEntry(e.getMessage());
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user