diff options
author | snowleo <schneeleo@gmail.com> | 2012-01-10 01:02:23 +0100 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-01-10 01:02:23 +0100 |
commit | 703c5741bd665078f5363651fe2fa95dd36acbfb (patch) | |
tree | ca38f0ed350a9f6130c255a78a28af73af576181 | |
parent | d64c73fc51817b3698510b7eea0cdfa274a58c63 (diff) | |
download | Essentials-703c5741bd665078f5363651fe2fa95dd36acbfb.tar Essentials-703c5741bd665078f5363651fe2fa95dd36acbfb.tar.gz Essentials-703c5741bd665078f5363651fe2fa95dd36acbfb.tar.lz Essentials-703c5741bd665078f5363651fe2fa95dd36acbfb.tar.xz Essentials-703c5741bd665078f5363651fe2fa95dd36acbfb.zip |
Essentials should run now...
3 files changed, 9 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Kits.java b/Essentials/src/com/earth2me/essentials/Kits.java index 880f3f511..a1ea2a8e9 100644 --- a/Essentials/src/com/earth2me/essentials/Kits.java +++ b/Essentials/src/com/earth2me/essentials/Kits.java @@ -27,7 +27,7 @@ public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.setti @Override public File getStorageFile() throws IOException { - throw new UnsupportedOperationException("Not supported yet."); + return new File(ess.getDataFolder(), "kits.yml"); } @Override diff --git a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java b/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java index b865388f0..71633d10f 100644 --- a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java +++ b/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java @@ -37,8 +37,8 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen /** * Warning: If you access this method, you have to acquire a read or write lock first - * - * + * + * * @return Object storing all the data */ @Override @@ -93,7 +93,7 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen { onReload(true); } - + public void onReload(boolean instant) { reader.schedule(instant); @@ -141,6 +141,10 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen public File onStart() throws IOException { final File file = getStorageFile(); + while (rwl.getReadHoldCount() > 0) + { + rwl.readLock().unlock(); + } rwl.writeLock().lock(); return file; } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java index b208b5e43..38c6cc3f9 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java @@ -29,6 +29,7 @@ public class EssentialsConnect } ess = (IEssentials)essPlugin; protect = (IProtect)essProtect; + protect.setSettings(new ProtectHolder(ess)); ProtectReloader pr = new ProtectReloader(); pr.onReload(); ess.addReloadListener(pr); |