summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-16 21:43:43 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-16 21:43:43 +0000
commita805c5425c68afe8f04856ede7060eda62266f2d (patch)
tree3e3da5aa13eb949416fea48de06a638f68f537ea
parent139a3a128a154dc6d28f7cf5c8b8c0026808893d (diff)
downloadEssentials-a805c5425c68afe8f04856ede7060eda62266f2d.tar
Essentials-a805c5425c68afe8f04856ede7060eda62266f2d.tar.gz
Essentials-a805c5425c68afe8f04856ede7060eda62266f2d.tar.lz
Essentials-a805c5425c68afe8f04856ede7060eda62266f2d.tar.xz
Essentials-a805c5425c68afe8f04856ede7060eda62266f2d.zip
Only update config, if there are worth values.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1504 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
index 31efc87fa..60d27d6e6 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsUpgrade.java
@@ -42,16 +42,21 @@ public class EssentialsUpgrade
EssentialsConf conf = new EssentialsConf(configFile);
conf.load();
Worth w = new Worth(ess.getDataFolder());
+ boolean found = false;
for (Material mat : Material.values())
{
int id = mat.getId();
double value = conf.getDouble("worth-" + id, Double.NaN);
if (!Double.isNaN(value))
{
+ found = true;
w.setPrice(new ItemStack(mat, 1, (short)0, (byte)0), value);
}
}
- removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
+ if (found)
+ {
+ removeLinesFromConfig(configFile, "\\s*#?\\s*worth-[0-9]+.*", "# Worth values have been moved to worth.yml");
+ }
}
catch (Throwable e)
{