3 files changed, 19 insertions, 23 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java
index 4d87a746f3..b35ad2c063 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java
@@ -2,5 +2,5 @@ package gtPlusPlus.plugin.fixes.interfaces;
 
 public interface IBugFix {
 
-    public boolean isFixValid();
+    boolean isFixValid();
 }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index f4c4df492e..2fa92951c7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -13,7 +13,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
-import gtPlusPlus.preloader.DevHelper;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class VanillaBedHeightFix implements IBugFix {
 
@@ -22,25 +22,21 @@ public class VanillaBedHeightFix implements IBugFix {
 
     public VanillaBedHeightFix(IPlugin minstance) {
         mParent = minstance;
-        if (DevHelper.isValidHelperObject()) {
-            Method m;
-            if (DevHelper.isObfuscatedEnvironment()) {
-                m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
-            } else {
-                m = ReflectionUtils.getMethod(
-                        net.minecraft.entity.player.EntityPlayer.class,
-                        "sleepInBedAt",
-                        int.class,
-                        int.class,
-                        int.class);
-            }
-            if (m != null) {
-                mSleepInBedAt = m;
-                mParent.log("Registering Bed Height Fix.");
-                Utils.registerEvent(this);
-            } else {
-                mSleepInBedAt = null;
-            }
+        Method m;
+        if (!CORE_Preloader.DEV_ENVIRONMENT) {
+            m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
+        } else {
+            m = ReflectionUtils.getMethod(
+                    net.minecraft.entity.player.EntityPlayer.class,
+                    "sleepInBedAt",
+                    int.class,
+                    int.class,
+                    int.class);
+        }
+        if (m != null) {
+            mSleepInBedAt = m;
+            mParent.log("Registering Bed Height Fix.");
+            Utils.registerEvent(this);
         } else {
             mSleepInBedAt = null;
         }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
index 98657b455f..ed1d9890d7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
@@ -62,13 +62,13 @@ public class MusicTocker extends MusicTicker implements Runnable {
         return false;
     }
 
-    private final void updateInternalNumber() {
+    private void updateInternalNumber() {
         if (ReflectionUtils.doesFieldExist(getClass(), "field_147676_d")) {
             ReflectionUtils.setField(this, "field_147676_d", mTimeUntilNextTrack);
         }
     }
 
-    private final void updateInternalSound(ISound aSound) {
+    private void updateInternalSound(ISound aSound) {
         if (ReflectionUtils.doesFieldExist(getClass(), "field_147678_c")) {
             ReflectionUtils.setField(this, "field_147678_c", aSound);
         }