From d425f6736a74e3505eed760d6f647e3292701460 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Thu, 21 May 2015 19:24:55 -0700 Subject: [PATCH] Fixed database migration breakage. Having to do with the new *.ignore files. --- src/me/ryanhamshire/GriefPrevention/DataStore.java | 2 +- src/me/ryanhamshire/GriefPrevention/FlatFileDataStore.java | 3 ++- src/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/DataStore.java b/src/me/ryanhamshire/GriefPrevention/DataStore.java index 8cc6892..1118034 100644 --- a/src/me/ryanhamshire/GriefPrevention/DataStore.java +++ b/src/me/ryanhamshire/GriefPrevention/DataStore.java @@ -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.NotIgnoringAnyone, "You're not ignoring anyone.", 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.Containers, "Containers", null); this.addDefault(defaults, Messages.Access, "Access", null); diff --git a/src/me/ryanhamshire/GriefPrevention/FlatFileDataStore.java b/src/me/ryanhamshire/GriefPrevention/FlatFileDataStore.java index 1d0417a..c7d65aa 100644 --- a/src/me/ryanhamshire/GriefPrevention/FlatFileDataStore.java +++ b/src/me/ryanhamshire/GriefPrevention/FlatFileDataStore.java @@ -699,8 +699,9 @@ public class FlatFileDataStore extends DataStore //all group data files start with a dollar sign. ignoring those, already handled above if(file.getName().startsWith("$")) continue; - //ignore special files (claimID) + //ignore special files if(file.getName().startsWith("_")) continue; + if(file.getName().endsWith(".ignore")) continue; UUID playerID = UUID.fromString(file.getName()); databaseStore.savePlayerData(playerID, this.getPlayerData(playerID)); diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index f012b4d..023287b 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -247,7 +247,6 @@ public class GriefPrevention extends JavaPlugin 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(e.getMessage()); e.printStackTrace(); return; }