Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +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
90 Zeilen
2.5 KiB
Diff
90 Zeilen
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Tue, 22 Dec 2020 13:51:06 -0800
|
|
Subject: [PATCH] Added EntityDamageItemEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..13862939d7b633f08d5c70bfd2097c47278efcce
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java
|
|
@@ -0,0 +1,77 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when an item on or used by an entity takes durability damage as a result of being hit/used.
|
|
+ * <p>
|
|
+ * NOTE: default vanilla behaviour dictates that armor/tools picked up by
|
|
+ * mobs do not take damage (except via Thorns).
|
|
+ */
|
|
+public class EntityDamageItemEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+ private final ItemStack item;
|
|
+ private int damage;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ public EntityDamageItemEvent(@NotNull Entity entity, @NotNull ItemStack item, int damage) {
|
|
+ super(entity);
|
|
+ this.item = item;
|
|
+ this.damage = damage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the item being damaged.
|
|
+ *
|
|
+ * @return the item
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getItem() {
|
|
+ return item;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the amount of durability damage this item will be taking.
|
|
+ *
|
|
+ * @return durability change
|
|
+ */
|
|
+ public int getDamage() {
|
|
+ return damage;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the amount of durability damage this item will be taking.
|
|
+ *
|
|
+ * @param damage the damage amount to cause
|
|
+ */
|
|
+ public void setDamage(int damage) {
|
|
+ this.damage = damage;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|