Update CraftBukkit to Minecraft 1.4.6

This commit is contained in:
feildmaster
2012-12-19 22:03:52 -06:00
parent 9f1bf124ee
commit 23b6764374
115 changed files with 1930 additions and 1426 deletions

View File

@@ -91,7 +91,6 @@ public class PropertyManager {
public String getString(String s, String s1) {
if (!this.properties.containsKey(s)) {
s1 = this.getOverride(s, s1); // CraftBukkit
this.properties.setProperty(s, s1);
this.savePropertiesFile();
}
@@ -103,7 +102,6 @@ public class PropertyManager {
try {
return this.getOverride(s, Integer.parseInt(this.getString(s, "" + i))); // CraftBukkit
} catch (Exception exception) {
i = this.getOverride(s, i); // CraftBukkit
this.properties.setProperty(s, "" + i);
return i;
}
@@ -113,7 +111,6 @@ public class PropertyManager {
try {
return this.getOverride(s, Boolean.parseBoolean(this.getString(s, "" + flag))); // CraftBukkit
} catch (Exception exception) {
flag = this.getOverride(s, flag); // CraftBukkit
this.properties.setProperty(s, "" + flag);
return flag;
}