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,12 +5,12 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
index c404a5b8e..554d9bd30 100644
index 0ee07264..bc1f3f1c 100644
--- a/src/main/java/org/bukkit/entity/Item.java
+++ b/src/main/java/org/bukkit/entity/Item.java
@@ -91,4 +91,34 @@ public interface Item extends Entity {
@@ -120,4 +120,34 @@ public interface Item extends Entity {
*/
public void setCanMobPickup(boolean canMobPickup);
public void setWillAge(boolean willAge);
// Paper end
+
+ // Purpur start