mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
Add WardenAngerChangeEvent (#7943)
This commit is contained in:
Dustin
GitHub
parent
cb410bb612
commit
48f7a1a9ef
117
patches/api/0385-Add-WardenAngerChangeEvent.patch
Normal file
117
patches/api/0385-Add-WardenAngerChangeEvent.patch
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
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;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
48
patches/server/0910-Add-WardenAngerChangeEvent.patch
Normal file
48
patches/server/0910-Add-WardenAngerChangeEvent.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: nopjar <code.nopjar@gmail.com>
|
||||||
|
Date: Sun, 12 Jun 2022 02:26:04 +0200
|
||||||
|
Subject: [PATCH] Add WardenAngerChangeEvent
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
|
||||||
|
index e9b4f29e1844f7c44e341f9b1c07c676469ca3b6..d76800a79faef26aab0cf99b28dfa4621877ecc7 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
|
||||||
|
@@ -145,7 +145,7 @@ public class AngerManagement {
|
||||||
|
public int increaseAnger(Entity entity, int amount) {
|
||||||
|
boolean bl = !this.angerBySuspect.containsKey(entity);
|
||||||
|
int i = this.angerBySuspect.computeInt(entity, (suspect, anger) -> {
|
||||||
|
- return Math.min(150, (anger == null ? 0 : anger) + amount);
|
||||||
|
+ return Math.min(150, (anger == null ? 0 : anger) + amount); // Paper - diff on change
|
||||||
|
});
|
||||||
|
if (bl) {
|
||||||
|
int j = this.angerByUuid.removeInt(entity.getUUID());
|
||||||
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||||
|
index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..cd6fb81d14706217c92fccc7853afce4010dfd1b 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
||||||
|
@@ -361,7 +361,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Brain<Warden> getBrain() {
|
||||||
|
- return super.getBrain();
|
||||||
|
+ return (Brain<Warden>) super.getBrain(); // Paper - decompile fix
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@@ -460,6 +460,15 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
|
||||||
|
@VisibleForTesting
|
||||||
|
public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
|
||||||
|
if (!this.isNoAi() && this.canTargetEntity(entity)) {
|
||||||
|
+ // Paper start
|
||||||
|
+ int activeAnger = this.angerManagement.getActiveAnger(entity);
|
||||||
|
+ io.papermc.paper.event.entity.WardenAngerChangeEvent event = new io.papermc.paper.event.entity.WardenAngerChangeEvent((org.bukkit.entity.Warden) this.getBukkitEntity(), entity.getBukkitEntity(), activeAnger, Math.min(150, activeAnger + amount));
|
||||||
|
+ this.level.getCraftServer().getPluginManager().callEvent(event);
|
||||||
|
+ if (event.isCancelled()) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ amount = event.getNewAnger() - activeAnger;
|
||||||
|
+ // Paper end
|
||||||
|
WardenAi.setDigCooldown(this);
|
||||||
|
boolean bl = !(this.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse((LivingEntity)null) instanceof Player);
|
||||||
|
int i = this.angerManagement.increaseAnger(entity, amount);
|
||||||
Loading…
Reference in New Issue
Block a user