summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/PropertyManager.java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-12-19 22:03:52 -0600
committerfeildmaster <admin@feildmaster.com>2012-12-20 10:43:00 -0600
commit23b67643741d5754af4de020a29d557078f9f81d (patch)
tree90e1a32f7eb94af49a381cb6bc34bf6247f0efe6 /src/main/java/net/minecraft/server/PropertyManager.java
parent9f1bf124eec7c20f16b2034fd9fba55f70c805fd (diff)
downloadcraftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.gz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.lz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.xz
craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.zip
Update CraftBukkit to Minecraft 1.4.6
Diffstat (limited to 'src/main/java/net/minecraft/server/PropertyManager.java')
-rw-r--r--src/main/java/net/minecraft/server/PropertyManager.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/PropertyManager.java b/src/main/java/net/minecraft/server/PropertyManager.java
index af01fd33..3f87365a 100644
--- a/src/main/java/net/minecraft/server/PropertyManager.java
+++ b/src/main/java/net/minecraft/server/PropertyManager.java
@@ -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;
}