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)
This commit is contained in:
William Blake Galbreath
2020-10-03 17:49:12 -05:00
parent bd83a6b30d
commit a16a79c6d8
3 changed files with 4 additions and 4 deletions

2
Paper

Submodule Paper updated: 8a046c95a4...f1997241b4

View File

@@ -1 +1 @@
1.16.3--fd414fa23a6ce82fdaaa1986abc23549af515254
1.16.3--4a8e86007d77176795cf23e94d6600368f353db6

View File

@@ -7458,10 +7458,10 @@ index fd32d1450a..c38e514b00 100644
LinkedList<BukkitWorker> 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<ScoreboardScore> consumer) {