diff options
author | snowleo <schneeleo@gmail.com> | 2012-03-03 02:40:22 +0100 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-03-03 02:40:22 +0100 |
commit | 22a37a0c1bfdad81196a38e23c120e9ddee4b43f (patch) | |
tree | cb15cb445b463669adf99bef561537610516d60c /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java | |
parent | 7b8a9d60d7da4cba5013671920b1064f711b4538 (diff) | |
download | Essentials-22a37a0c1bfdad81196a38e23c120e9ddee4b43f.tar Essentials-22a37a0c1bfdad81196a38e23c120e9ddee4b43f.tar.gz Essentials-22a37a0c1bfdad81196a38e23c120e9ddee4b43f.tar.lz Essentials-22a37a0c1bfdad81196a38e23c120e9ddee4b43f.tar.xz Essentials-22a37a0c1bfdad81196a38e23c120e9ddee4b43f.zip |
Revert "I honestly have no idea if this works, but on paper it does. Will be great, now to figure out how to test." until there is a real alternative.
This reverts commit 7b8a9d60d7da4cba5013671920b1064f711b4538.
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java')
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java index 9f1cc122a..539ff208b 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java @@ -66,6 +66,10 @@ public class EssentialsConnect @Override public void onReload() { + if (protect.getStorage() != null) + { + protect.getStorage().onPluginDeactivation(); + } /* * for (ProtectConfig protectConfig : ProtectConfig.values()) { if (protectConfig.isList()) { @@ -93,7 +97,7 @@ public class EssentialsConnect settings.getData().getDbuser(), settings.getData().getDbpassword())); } - catch (ClassNotFoundException ex) + catch (PropertyVetoException ex) { LOGGER.log(Level.SEVERE, null, ex); } @@ -104,15 +108,15 @@ public class EssentialsConnect { protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db")); } - catch (ClassNotFoundException ex) + catch (PropertyVetoException ex) { LOGGER.log(Level.SEVERE, null, ex); } } - /* - * if (protect.getSettingBool(ProtectConfig.memstore)) { protect.setStorage(new - * ProtectedBlockMemory(protect.getStorage(), protect)); } - */ + /*if (protect.getSettingBool(ProtectConfig.memstore)) + { + protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect)); + }*/ } finally |