1 files changed, 43 insertions, 0 deletions
diff --git a/patches/server/0699-Time-scoreboard-search.patch b/patches/server/0699-Time-scoreboard-search.patch
new file mode 100644
index 0000000000..5c5417edeb
--- /dev/null
+++ b/patches/server/0699-Time-scoreboard-search.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Tue, 21 Apr 2020 01:53:22 -0700
+Subject: [PATCH] Time scoreboard search
+
+Plugins leaking scoreboards will make this very expensive,
+let server owners debug it easily
+
+diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
+index 670dcfa32d003870091b75937f1603a5ac9fa7d1..112029cb275d45dced60807820f1bfe9f394496d 100644
+--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
++++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
+@@ -47,6 +47,7 @@ public final class MinecraftTimings {
+     public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
+     public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
+     public static final Timing distanceManagerTick = Timings.ofSafe("Distance Manager Tick"); // Paper - add timings for distance manager
++    public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search
+ 
+     public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
+index 6fcb2356b471c5a61faa0813a891c3898683d01f..7674939964894a56ce495e47d400cbf12cd0475b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
++++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
+@@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager {
+ 
+     // CraftBukkit method
+     public void getScoreboardScores(ObjectiveCriteria criteria, String name, Consumer<Score> consumer) {
++        // Paper start - add timings for scoreboard search
++        // plugins leaking scoreboards will make this very expensive, let server owners debug it easily
++        co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.startTimingIfSync();
++        try {
++        // Paper end - add timings for scoreboard search
+         for (CraftScoreboard scoreboard : this.scoreboards) {
+             Scoreboard board = scoreboard.board;
+             board.forAllObjectives(criteria, name, (score) -> consumer.accept(score));
+         }
++        } finally { // Paper start - add timings for scoreboard search
++            co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.stopTimingIfSync();
++        }
++        // Paper end - add timings for scoreboard search
+     }
+ }