mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ver/1.14'

Browse source
This commit is contained in:
Shane Freeder 2019-12-15 23:05:36 +00:00
commit 8b25307b34
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Spigot-Server-Patches/0009-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 19caf0f475af73934d0bf85cd718375b5f952518 Mon Sep 17 00:00:00 2001 From 477a2ecc887625d1f34ed0d559958abe1a38b477 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600 Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -6,10 +6,10 @@ Subject: [PATCH] Timings v2
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
new file mode 100644 new file mode 100644
index 000000000..c6818bc86 index 000000000..69e26a826
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,135 @@ @@ -0,0 +1,141 @@
+package co.aikar.timings; +package co.aikar.timings;
+ +
+import com.google.common.collect.MapMaker; +import com.google.common.collect.MapMaker;
@ -79,10 +79,16 @@ index 000000000..c6818bc86
+ plugin = TimingsManager.getPluginByClassloader(taskClass); + plugin = TimingsManager.getPluginByClassloader(taskClass);
+ } + }
+ +
+ final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> + final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> {
+ clazz.isAnonymousClass() || clazz.isLocalClass() + try {
+ ? clazz.getName() + return clazz.isAnonymousClass() || clazz.isLocalClass()
+ : clazz.getCanonicalName()); + ? clazz.getName()
+ : clazz.getCanonicalName();
+ } catch (Throwable ex) {
+ new Exception("Error occurred detecting class name", ex).printStackTrace();
+ return "MangledClassFile";
+ }
+ });
+ +
+ StringBuilder name = new StringBuilder(64); + StringBuilder name = new StringBuilder(64);
+ name.append("Task: ").append(taskname); + name.append("Task: ").append(taskname);
@ -1195,7 +1201,7 @@ index 820180ab3..fa6400dcc 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer; public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java 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 --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@