From 23b67643741d5754af4de020a29d557078f9f81d Mon Sep 17 00:00:00 2001
From: feildmaster <admin@feildmaster.com>
Date: Wed, 19 Dec 2012 22:03:52 -0600
Subject: Update CraftBukkit to Minecraft 1.4.6

---
 src/main/java/net/minecraft/server/PropertyManager.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/main/java/net/minecraft/server/PropertyManager.java')

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;
         }
-- 
cgit v1.2.3