summaryrefslogtreecommitdiffstats
path: root/nms-patches/MethodProfiler.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-01 08:32:46 +1100
committermd_5 <git@md-5.net>2016-03-01 09:32:45 +1100
commitaa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch)
treecb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/MethodProfiler.patch
parente1ebe524a78e27f6a2829ed4574fded3779094e1 (diff)
downloadcraftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/MethodProfiler.patch')
-rw-r--r--nms-patches/MethodProfiler.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/nms-patches/MethodProfiler.patch b/nms-patches/MethodProfiler.patch
index 71b91ba1..0b080a61 100644
--- a/nms-patches/MethodProfiler.patch
+++ b/nms-patches/MethodProfiler.patch
@@ -58,7 +58,7 @@
public List<MethodProfiler.ProfilerInfo> b(String s) {
- if (!this.a) {
-- return null;
+- return Collections.emptyList();
- } else {
- 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;
@@ -139,7 +139,7 @@
}
- public int compareTo(Object object) {
-+ public int compareTo(MethodProfiler.ProfilerInfo object) {
++ public int compareTo(MethodProfiler.ProfilerInfo object) { // CraftBukkit: decompile error
return this.a((MethodProfiler.ProfilerInfo) object);
}
}