mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-22 20:40:43 +02:00
c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
118 lines
3.3 KiB
Diff
118 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: nopjar <code.nopjar@gmail.com>
|
|
Date: Sun, 12 Jun 2022 00:56:45 +0200
|
|
Subject: [PATCH] Add WardenAngerChangeEvent
|
|
|
|
Adding a event which gets called when a warden is angered by
|
|
another entity.
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java b/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..4fd31d4d8b35f27789f3cd9581e7c17a6bde5373
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java
|
|
@@ -0,0 +1,103 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.entity.Warden;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when a Warden's anger level has changed due to another entity.
|
|
+ * <p>
|
|
+ * If the event is cancelled, the warden's anger level will not change.
|
|
+ */
|
|
+public class WardenAngerChangeEvent extends EntityEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final Entity target;
|
|
+ private final int oldAnger;
|
|
+ private int newAnger;
|
|
+
|
|
+ public WardenAngerChangeEvent(@NotNull final Warden warden, @Nullable final Entity target, final int oldAnger, final int newAnger) {
|
|
+ super(warden);
|
|
+ this.target = target;
|
|
+ this.oldAnger = oldAnger;
|
|
+ this.newAnger = newAnger;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the entity (if any) which triggered this anger update.
|
|
+ *
|
|
+ * @return triggering entity, or null
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity getTarget() {
|
|
+ return target;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the old anger level.
|
|
+ *
|
|
+ * @return old anger level
|
|
+ * @see Warden#getAnger(Entity)
|
|
+ */
|
|
+ public int getOldAnger() {
|
|
+ return oldAnger;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the new anger level resulting from this event.
|
|
+ *
|
|
+ * @return new anger level
|
|
+ * @see Warden#getAnger(Entity)
|
|
+ */
|
|
+ public int getNewAnger() {
|
|
+ return newAnger;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the new anger level resulting from this event.
|
|
+ * <p>
|
|
+ * The anger of a warden is capped at 150.
|
|
+ *
|
|
+ * @param newAnger the new anger level, max 150
|
|
+ * @see Warden#setAnger(Entity, int)
|
|
+ * @throws IllegalArgumentException if newAnger is greater than 150
|
|
+ */
|
|
+ public void setNewAnger(int newAnger) {
|
|
+ if (newAnger > 150)
|
|
+ throw new IllegalArgumentException("newAnger must not be greater than 150");
|
|
+
|
|
+ this.newAnger = newAnger;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public Warden getEntity() {
|
|
+ return (Warden) entity;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancelled) {
|
|
+ this.cancelled = cancelled;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|