Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +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 Zeilen
1014 B
Diff
25 Zeilen
1014 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anrza <andrzejrzeczycki314@gmail.com>
|
|
Date: Wed, 15 Jul 2020 12:07:58 +0200
|
|
Subject: [PATCH] Add LivingEntity#clearActiveItem
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 2c559c590b96753aa5dc2db2bacca32d8afad352..8375cbdb79e82afebbcc18f85e874238f18cda50 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -849,6 +849,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
@NotNull
|
|
org.bukkit.inventory.ItemStack getActiveItem();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Interrupts any ongoing active "usage" or consumption or an item.
|
|
+ */
|
|
+ void clearActiveItem();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Get's remaining time a player needs to keep hands raised with an item to finish using it.
|
|
* @return Remaining ticks to use the item
|