summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/nbproject/project.properties1
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsConf.java35
-rw-r--r--examples/bpermissions.yml7
3 files changed, 24 insertions, 19 deletions
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties
index a9cebbb92..fd32306ca 100644
--- a/Essentials/nbproject/project.properties
+++ b/Essentials/nbproject/project.properties
@@ -150,5 +150,6 @@ run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
+source.reference.craftbukkit.jar=U:\\Users\\KHobbits\\GIT\\CraftBukkit\\src\\main\\java\\
src.dir=src
test.src.dir=test
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
index bc262e3f5..d6414fb05 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java
@@ -91,18 +91,7 @@ public class EssentialsConf extends YamlConfiguration
}
else
{
- try
- {
- LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
- if (!configFile.createNewFile())
- {
- LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
- }
- }
- catch (IOException ex)
- {
- LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
- }
+ return;
}
}
@@ -367,6 +356,28 @@ public class EssentialsConf extends YamlConfiguration
final String data = saveToString();
+ if (data.length() == 0)
+ {
+ return;
+ }
+
+ if (!configFile.exists())
+ {
+ try
+ {
+ LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString()));
+ if (!configFile.createNewFile())
+ {
+ LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()));
+ }
+ }
+ catch (IOException ex)
+ {
+ LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex);
+ }
+ }
+
+
final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8);
try
diff --git a/examples/bpermissions.yml b/examples/bpermissions.yml
index 16017c9ec..a6ca8d8d0 100644
--- a/examples/bpermissions.yml
+++ b/examples/bpermissions.yml
@@ -132,10 +132,3 @@ groups:
- Admin
meta:
priority: '100'
-players:
- notch:
- - Default
- snowleo:
- - Admin
- KHobbits:
- - Owner