Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30: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
89 Zeilen
3.0 KiB
Diff
89 Zeilen
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: nossr50 <nossr50@gmail.com>
|
|
Date: Thu, 26 Mar 2020 19:30:58 -0700
|
|
Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..ebdebe7b6ec6ed5aadc7ee925ba0147e61e6bc84
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
|
|
@@ -0,0 +1,76 @@
|
|
+package com.destroystokyo.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.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when processing a player's attack on an entity when the player's attack strength cooldown is reset
|
|
+ */
|
|
+public class PlayerAttackEntityCooldownResetEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private final float cooledAttackStrength;
|
|
+ private boolean cancel = false;
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ @NotNull private final Entity attackedEntity;
|
|
+
|
|
+ public PlayerAttackEntityCooldownResetEvent(@NotNull Player who, @NotNull Entity attackedEntity, float cooledAttackStrength) {
|
|
+ super(who);
|
|
+ this.attackedEntity = attackedEntity;
|
|
+ this.cooledAttackStrength = cooledAttackStrength;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static @NotNull HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins
|
|
+ * <p>
|
|
+ * If an attack cooldown event is cancelled, the players attack strength will remain at the same value instead of being reset.
|
|
+ *
|
|
+ * @return true if this event is cancelled
|
|
+ */
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancel;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Cancelling this event will prevent the target player from having their cooldown reset from attacking this entity
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancel = cancel;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the value of the players cooldown attack strength when they initiated the attack
|
|
+ *
|
|
+ * @return returns the original player cooldown value
|
|
+ */
|
|
+ public float getCooledAttackStrength() {
|
|
+ return cooledAttackStrength;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the entity attacked by the player
|
|
+ *
|
|
+ * @return the entity attacked by the player
|
|
+ */
|
|
+ @NotNull
|
|
+ public Entity getAttackedEntity() {
|
|
+ return attackedEntity;
|
|
+ }
|
|
+}
|