Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6ac47e5 Fix numerous item duplication issues and teleport issues
b7402f11 Add phantom creative and insomniac controls (#3222)
75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)
This commit is contained in:
William Blake Galbreath
2020-04-25 15:48:09 -05:00
parent 6daa61aea9
commit 8ec7d99ec0
108 changed files with 642 additions and 746 deletions

View File

@@ -0,0 +1,27 @@
From 2752e497629793d493d817e168f6a3d3b7bb3146 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:25:16 -0500
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
---
.../org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 3dd0faea7..48f66b0c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -750,5 +750,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance;
}
+
+ @Override
+ public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
+ getHandle().receive(((CraftItem)item).getHandle(), quantity);
+ }
// Purpur end
}
--
2.24.0