mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-29 08:14:53 +02:00
385f313a8b
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: d41796de SPIGOT-7071: Add Player#stopSound(SoundCategory category) 61dae5b2 SPIGOT-7011, SPIGOT-7065: Overhaul of structures CraftBukkit Changes: 991aeda12 SPIGOT-1729, SPIGOT-7090: Keep precision in teleportation between worlds 5c9a5f628 SPIGOT-7071: Add Player#stopSound(SoundCategory category) 68f888ded SPIGOT-7011, SPIGOT-7065: Overhaul of structures 0231a3746 Remove outdated build delay. Spigot Changes: 475f6008 Rebuild patches 8ce1761f 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;
|
|
+ }
|
|
+}
|