mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
f6636fca9e
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ebb0e28d #631: Add Villager#shakeHead 751469c6 #629: Add LivingEntity#isClimbing CraftBukkit Changes: 622cf611 SPIGOT-6555: Cannot access shield BlockStateMeta 8b2e78ec SPIGOT-6542: Fix counting players with fauxSleeping = true f66c437a SPIGOT-6561: Add events for dripleaf tilting 6ed40004 SPIGOT-6560: Crash when falling stalactite hits player 72a2901b SPIGOT-6557: PlayerEditBookEvent#setNewBookMeta does not update meta a07e783a #865: Implement Villager#shakeHead 3252ff18 #863: Add LivingEntity#isClimbing 77058c79 SPIGOT-6554: Worlds created with the bukkit ChunkGenerator cannot save
21 lines
995 B
Diff
21 lines
995 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sun, 23 Aug 2020 19:36:22 +0200
|
|
Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 46fe4779bb894f3beb1f7814dbcc95a7f03b9e5a..bb4896eb52ae8031b7374dfdc408da6f2f3cf68e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -811,5 +811,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
((Mob) getHandle()).getJumpControl().jump();
|
|
}
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public void playPickupItemAnimation(org.bukkit.entity.Item item, int quantity) {
|
|
+ getHandle().take(((CraftItem) item).getHandle(), quantity);
|
|
+ }
|
|
// Paper end
|
|
}
|