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
106 Zeilen
3.4 KiB
Diff
106 Zeilen
3.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sun, 18 Sep 2022 13:10:28 -0400
|
|
Subject: [PATCH] Add PrePlayerAttackEntityEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java b/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..148f46f4572a778f090b461808b53cf9cad10e11
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PrePlayerAttackEntityEvent.java
|
|
@@ -0,0 +1,93 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when the player tries to attack an entity.
|
|
+ * <p>
|
|
+ * This occurs before any of the damage logic, so cancelling this event
|
|
+ * will prevent any sort of sounds from being played when attacking.
|
|
+ * <p>
|
|
+ * This event will fire as cancelled for certain entities, with {@link PrePlayerAttackEntityEvent#willAttack()} being false
|
|
+ * to indicate that this entity will not actually be attacked.
|
|
+ * <p>
|
|
+ * Note: there may be other factors (invulnerability, etc.) that will prevent this entity from being attacked that this event will not cover
|
|
+ */
|
|
+public class PrePlayerAttackEntityEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ @NotNull
|
|
+ private final Entity attacked;
|
|
+ private final boolean willAttack;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public PrePlayerAttackEntityEvent(@NotNull Player player, @NotNull Entity attacked, boolean willAttack) {
|
|
+ super(player);
|
|
+ this.attacked = attacked;
|
|
+ this.willAttack = willAttack;
|
|
+ this.cancelled = !willAttack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the entity that was attacked in this event.
|
|
+ *
|
|
+ * @return entity that was attacked
|
|
+ */
|
|
+ @NotNull
|
|
+ public Entity getAttacked() {
|
|
+ return this.attacked;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets if this entity will be attacked normally.
|
|
+ * Entities like falling sand will return {@code false} because
|
|
+ * their entity type does not allow them to be attacked.
|
|
+ * <p>
|
|
+ * Note: there may be other factors (invulnerability, etc.) that will prevent this entity from being attacked that this event will not cover
|
|
+ *
|
|
+ * @return if the entity will actually be attacked
|
|
+ */
|
|
+ public boolean willAttack() {
|
|
+ return this.willAttack;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets if this attack should be cancelled, note if {@link PrePlayerAttackEntityEvent#willAttack()} returns false
|
|
+ * this event will always be cancelled.
|
|
+ *
|
|
+ * @param cancel {@code true} if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ if (!this.willAttack) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|