--- a/net/minecraft/server/MethodProfiler.java
+++ b/net/minecraft/server/MethodProfiler.java
@@ -13,6 +13,7 @@
 
 public class MethodProfiler {
 
+    public static final boolean ENABLED = Boolean.getBoolean("enableDebugMethodProfiler"); // CraftBukkit - disable unless specified in JVM arguments
     private static final Logger a = LogManager.getLogger();
     private final List<String> b = Lists.newArrayList();
     private final List<Long> c = Lists.newArrayList();
@@ -41,6 +42,7 @@
     }
 
     public void a(int i) {
+        if (!ENABLED) return; // CraftBukkit
         if (!this.d) {
             this.d = true;
             this.f.clear();
@@ -52,6 +54,7 @@
     }
 
     public void a(String s) {
+        if (!ENABLED) return; // CraftBukkit
         if (this.d) {
             if (!this.e.isEmpty()) {
                 this.e = this.e + ".";
@@ -64,12 +67,14 @@
     }
 
     public void a(Supplier<String> supplier) {
+        if (!ENABLED) return; // CraftBukkit
         if (this.d) {
             this.a((String) supplier.get());
         }
     }
 
     public void e() {
+        if (!ENABLED) return; // CraftBukkit
         if (this.d && !this.c.isEmpty()) {
             long i = SystemUtils.c();
             long j = ((Long) this.c.remove(this.c.size() - 1)).longValue();
@@ -92,6 +97,7 @@
     }
 
     public List<MethodProfiler.ProfilerInfo> b(String s) {
+        if (!ENABLED) return Collections.emptyList(); // CraftBukkit
         long i = this.f.containsKey("root") ? ((Long) this.f.get("root")).longValue() : 0L;
         long j = this.f.containsKey(s) ? ((Long) this.f.get(s)).longValue() : -1L;
         ArrayList arraylist = Lists.newArrayList();
@@ -154,11 +160,13 @@
     }
 
     public void c(String s) {
+        if (!ENABLED) return; // CraftBukkit
         this.e();
         this.a(s);
     }
 
     public String f() {
+        if (!ENABLED) return "[DISABLED]"; // CraftBukkit
         return this.b.isEmpty() ? "[UNKNOWN]" : (String) this.b.get(this.b.size() - 1);
     }
 
@@ -178,7 +186,7 @@
             return methodprofiler_profilerinfo.a < this.a ? -1 : (methodprofiler_profilerinfo.a > this.a ? 1 : methodprofiler_profilerinfo.c.compareTo(this.c));
         }
 
-        public int compareTo(Object object) {
+        public int compareTo(MethodProfiler.ProfilerInfo object) { // CraftBukkit: decompile error
             return this.a((MethodProfiler.ProfilerInfo) object);
         }
     }