Merge branch 'ver/1.14'

Spigot-Server-Patches/Timings-v2.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 000000000..c6818bc86
+index 000000000..69e26a826
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +0,0 @@
@@ -79,10 +79,16 @@ index 000000000..c6818bc86
 +            plugin = TimingsManager.getPluginByClassloader(taskClass);
 +        }
 +
-+        final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz ->
-+                clazz.isAnonymousClass() || clazz.isLocalClass()
++        final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> {
++            try {
++                return clazz.isAnonymousClass() || clazz.isLocalClass()
 +                           ? clazz.getName()
-+                        : clazz.getCanonicalName());
++                           : clazz.getCanonicalName();
++            } catch (Throwable ex) {
++                new Exception("Error occurred detecting class name", ex).printStackTrace();
++                return "MangledClassFile";
++            }
++        });
 +
 +        StringBuilder name = new StringBuilder(64);
 +        name.append("Task: ").append(taskname);
@@ -1195,7 +1201,7 @@ index 820180ab3..fa6400dcc 100644
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public CraftPersistentDataContainer persistentDataContainer;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 66f74c106..542262fc8 100644
+index 526466c2e..36ed7a7a0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@