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
123 Zeilen
3.5 KiB
Diff
123 Zeilen
3.5 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..7f738c1116feae8e8571488d516fab2ab6c0244e
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/WardenAngerChangeEvent.java
|
|
@@ -0,0 +1,108 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import com.google.common.base.Preconditions;
|
|
+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.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Range;
|
|
+
|
|
+/**
|
|
+ * 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 HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final Entity target;
|
|
+ private final int oldAnger;
|
|
+ private int newAnger;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public WardenAngerChangeEvent(@NotNull final Warden warden, @NotNull final Entity target, final int oldAnger, final int newAnger) {
|
|
+ super(warden);
|
|
+ this.target = target;
|
|
+ this.oldAnger = oldAnger;
|
|
+ this.newAnger = newAnger;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the entity which triggered this anger update.
|
|
+ *
|
|
+ * @return triggering entity
|
|
+ */
|
|
+ @NotNull
|
|
+ public Entity getTarget() {
|
|
+ return this.target;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the old anger level.
|
|
+ *
|
|
+ * @return old anger level
|
|
+ * @see Warden#getAnger(Entity)
|
|
+ */
|
|
+ @Range(from = 0, to = 150)
|
|
+ public int getOldAnger() {
|
|
+ return this.oldAnger;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the new anger level resulting from this event.
|
|
+ *
|
|
+ * @return new anger level
|
|
+ * @see Warden#getAnger(Entity)
|
|
+ */
|
|
+ @Range(from = 0, to = 150)
|
|
+ public int getNewAnger() {
|
|
+ return this.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(@Range(from = 0, to = 150) int newAnger) {
|
|
+ Preconditions.checkArgument(newAnger <= 150, "newAnger must not be greater than 150");
|
|
+ this.newAnger = newAnger;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public Warden getEntity() {
|
|
+ return (Warden) super.getEntity();
|
|
+ }
|
|
+
|
|
+ @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;
|
|
+ }
|
|
+}
|