aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0752-Add-WardenAngerChangeEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0752-Add-WardenAngerChangeEvent.patch')
-rw-r--r--patches/server/0752-Add-WardenAngerChangeEvent.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0752-Add-WardenAngerChangeEvent.patch b/patches/server/0752-Add-WardenAngerChangeEvent.patch
new file mode 100644
index 0000000000..9344bd47cf
--- /dev/null
+++ b/patches/server/0752-Add-WardenAngerChangeEvent.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: nopjar <[email protected]>
+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 02abc5f387d781094bd2f39233444add3a470be1..1017c294b48bf0bbf733e1f41d580d1e6c927834 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
+@@ -146,7 +146,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 (Warden#increaseAngerAt WardenAngerChangeEvent)
+ });
+ 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 b5185fcb635fbf5e5ed9d6cc9cc517cb46ada5aa..937f81a859953498abe73bea560c86e6560e1c33 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
+@@ -488,6 +488,15 @@ public class Warden extends Monster implements VibrationSystem {
+ @VisibleForTesting
+ public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
+ if (!this.isNoAi() && this.canTargetEntity(entity)) {
++ // Paper start - Add WardenAngerChangeEvent
++ 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 - Add WardenAngerChangeEvent
+ WardenAi.setDigCooldown(this);
+ boolean flag1 = !(this.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null) instanceof Player); // CraftBukkit - decompile error
+ int j = this.angerManagement.increaseAnger(entity, amount);