geforkt von Mirrors/Paper
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
94 Zeilen
2.6 KiB
Diff
94 Zeilen
2.6 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..72ac972dea684a3ffac3bd48726746be0620af2e
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityDamageItemEvent.java
|
|
@@ -0,0 +1,81 @@
|
|
+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.ApiStatus;
|
|
+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;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ 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 this.item;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the amount of durability damage this item will be taking.
|
|
+ *
|
|
+ * @return durability change
|
|
+ */
|
|
+ public int getDamage() {
|
|
+ return this.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 this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|