mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 04:25:26 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
25 lines
1014 B
Diff
25 lines
1014 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anrza <andrzejrzeczycki314@gmail.com>
|
|
Date: Wed, 15 Jul 2020 12:08:49 +0200
|
|
Subject: [PATCH] Add LivingEntity#clearActiveItem
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 679e08544fc1e6973605dd2f3953c12a0d338ddd..4e7cb29909fd82d26029e4c78580ead500db5c2a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -851,6 +851,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
return getHandle().getUseItem().asBukkitMirror();
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void clearActiveItem() {
|
|
+ getHandle().stopUsingItem();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public int getItemUseRemainingTime() {
|
|
return getHandle().getUseItemRemainingTicks();
|