From a16a79c6d8e0f542f15e0cca4302f84ef5239626 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 3 Oct 2020 17:49:12 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: f1997241 Update Paperclip; use mvn.cmd on Windows (jmanpenilla) 3295265b [CI-SKIP] Fix typo in CONTRIBUTING.md 1165d595 Lazily track plugin scoreboards by default f6f99102 [Auto] Updated Upstream (CraftBukkit) 779eb50d [Auto] Updated Upstream (Spigot) --- Paper | 2 +- current-paper | 2 +- patches/server/0001-Tuinity-Server-Changes.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Paper b/Paper index 8a046c95a..f1997241b 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 8a046c95a4babfdd3fec3c0f4fa198f1437819b5 +Subproject commit f1997241b49db1262cf406248fc7ec0045f182b3 diff --git a/current-paper b/current-paper index 87ceec8a7..40b225454 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.3--fd414fa23a6ce82fdaaa1986abc23549af515254 +1.16.3--4a8e86007d77176795cf23e94d6600368f353db6 diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 6d7747d8d..0cad97236 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -7458,10 +7458,10 @@ index fd32d1450a..c38e514b00 100644 LinkedList getWorkers() { diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index ca2be30609..2c57013765 100644 +index 6fa2e271f7..3a9491e949 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -@@ -100,9 +100,18 @@ public final class CraftScoreboardManager implements ScoreboardManager { +@@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager { // CraftBukkit method public void getScoreboardScores(IScoreboardCriteria criteria, String name, Consumer consumer) {