diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch index 7a47ab62eb..e85440addc 100644 --- a/Spigot-Server-Patches/MC-Utils.patch +++ b/Spigot-Server-Patches/MC-Utils.patch @@ -796,4 +796,51 @@ index a21006290c..6c6f006f3a 100644 public int a() { return this.b.size(); } +diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java +index 1f1cb6a1b2..ced573d7fb 100644 +--- a/src/main/java/net/minecraft/server/SystemUtils.java ++++ b/src/main/java/net/minecraft/server/SystemUtils.java +@@ -0,0 +0,0 @@ public class SystemUtils { + return Collectors.toMap(Entry::getKey, Entry::getValue); + } + +- public static > String a(IBlockState iblockstate, Object object) { +- return iblockstate.a((Comparable)object); ++ public static > String a(IBlockState iblockstate, T object) { // Paper - decompile fix ++ return iblockstate.a(object); // Paper - decompile fix + } + + public static String a(String s, @Nullable MinecraftKey minecraftkey) { +@@ -0,0 +0,0 @@ public class SystemUtils { + } + + public static long b() { +- return c() / 1000000L; ++ return System.nanoTime() / 1000000L; // Paper + } + + public static long c() { +- return a.getAsLong(); ++ return System.nanoTime(); // Paper + } + + public static long d() { +@@ -0,0 +0,0 @@ public class SystemUtils { + futuretask.run(); + return (V)futuretask.get(); + } catch (ExecutionException executionexception) { +- logger.fatal("Error executing task", executionexception); ++ logger.fatal("Error executing task", executionexception.getCause() != null ? executionexception.getCause() : executionexception); // Paper + } catch (InterruptedException interruptedexception) { + logger.fatal("Error executing task", interruptedexception); + } +@@ -0,0 +0,0 @@ public class SystemUtils { + } + + public static Strategy g() { +- return SystemUtils.IdentityHashingStrategy.INSTANCE; ++ return (Strategy) IdentityHashingStrategy.INSTANCE; // Paper - decompile fix + } + + static enum IdentityHashingStrategy implements Strategy { -- \ No newline at end of file