Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
50cbb24c [CI-SKIP] Update JUNit on Mojang API to make dependendabot happy
74f507f4 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-10-15 22:27:51 -05:00
parent ca4c5027ba
commit a8a4826743
4 changed files with 11 additions and 11 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 acd80d81..810a1e55 100644
index c404a5b8e..554d9bd30 100644
--- a/src/main/java/org/bukkit/entity/Item.java
+++ b/src/main/java/org/bukkit/entity/Item.java
@@ -87,4 +87,34 @@ public interface Item extends Entity {
@@ -91,4 +91,34 @@ public interface Item extends Entity {
*/
public void setThrower(@Nullable UUID thrower);
public void setCanMobPickup(boolean canMobPickup);
// Paper end
+
+ // Purpur start