From 97cab1d4a43891d04230361bcc78425354eccf14 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

---
 .../monster/warden/AngerManagement.java.patch | 11 ++++++++++
 .../entity/monster/warden/Warden.java.patch   | 20 +++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 paper-server/patches/sources/net/minecraft/world/entity/monster/warden/AngerManagement.java.patch

diff --git a/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/AngerManagement.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/AngerManagement.java.patch
new file mode 100644
index 0000000000..f65a699a17
--- /dev/null
+++ b/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/AngerManagement.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/entity/monster/warden/AngerManagement.java
++++ b/net/minecraft/world/entity/monster/warden/AngerManagement.java
+@@ -146,7 +146,7 @@
+ 
+     public int increaseAnger(Entity entity, int amount) {
+         boolean bl = !this.angerBySuspect.containsKey(entity);
+-        int i = this.angerBySuspect.computeInt(entity, (suspect, anger) -> Math.min(150, (anger == null ? 0 : anger) + amount));
++        int i = this.angerBySuspect.computeInt(entity, (suspect, anger) -> Math.min(150, (anger == null ? 0 : anger) + amount)); // Paper - diff on change (Warden#increaseAngerAt WardenAngerChangeEvent)
+         if (bl) {
+             int j = this.angerByUuid.removeInt(entity.getUUID());
+             i += j;
diff --git a/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/Warden.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/Warden.java.patch
index 094d839026..c6378460b2 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/Warden.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/monster/warden/Warden.java.patch
@@ -18,7 +18,23 @@
      }
  
      @Override
-@@ -547,7 +547,7 @@
+@@ -482,6 +482,15 @@
+     @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.getTarget() instanceof Player);
+             int j = this.angerManagement.increaseAnger(entity, amount);
+@@ -547,7 +556,7 @@
  
      public void setAttackTarget(LivingEntity target) {
          this.getBrain().eraseMemory(MemoryModuleType.ROAR_TARGET);
@@ -27,7 +43,7 @@
          this.getBrain().eraseMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
          SonicBoom.setCooldown(this, 200);
      }
-@@ -582,11 +582,11 @@
+@@ -582,11 +591,11 @@
  
      @Override
      protected PathNavigation createNavigation(Level world) {