Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5b123cd1 [CI-SKIP] [Auto] Rebuild Patches
becb478c Add ignore discounts API
9e90c15f Add custom ranges to beacons
068313fa Item no age & no player pickup
1b3c20f9 Fix client lag on advancement loading (#4710)
c596edb1 [CI-SKIP] Update IRC information in readme and config (#4751)
a936a413 [Auto] Updated Upstream (Bukkit)
This commit is contained in:
BillyGalbreath
2020-11-11 11:59:54 -06:00
parent a295636d23
commit ef45666757
19 changed files with 52 additions and 124 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index 17789407b..c31f4040c 100644
index c680319e4..eaa1063ff 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -169,6 +169,7 @@ public class AdvancementDataPlayer {
@@ -170,6 +170,7 @@ public class AdvancementDataPlayer {
if (advancement == null) {
// CraftBukkit start
if (entry.getKey().getNamespace().equals("minecraft")) {