2022-06-14 12:34:41 +02:00
|
|
|
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
|
2024-04-12 21:14:06 +02:00
|
|
|
index 27e52ee93ab591e97f37705de64cb5b62c06e253..3d792957f27fd4bdfad8d76262a8e2a2012bf35f 100644
|
2022-06-14 12:34:41 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/AngerManagement.java
|
2022-12-07 22:57:15 +01:00
|
|
|
@@ -146,7 +146,7 @@ public class AngerManagement {
|
2024-04-12 21:14:06 +02:00
|
|
|
|
2022-06-14 12:34:41 +02:00
|
|
|
public int increaseAnger(Entity entity, int amount) {
|
|
|
|
boolean bl = !this.angerBySuspect.containsKey(entity);
|
2024-04-12 21:14:06 +02:00
|
|
|
- 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)
|
2022-06-14 12:34:41 +02:00
|
|
|
if (bl) {
|
|
|
|
int j = this.angerByUuid.removeInt(entity.getUUID());
|
2024-04-12 21:14:06 +02:00
|
|
|
i += j;
|
2022-06-14 12:34:41 +02:00
|
|
|
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
|
2024-10-23 23:12:09 +02:00
|
|
|
index 71311d30459d495c57e6fcf0115e4f34a232f1ad..6180019da58b19d2595da508aed3196af922d587 100644
|
2022-06-14 12:34:41 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
|
2024-10-23 23:12:09 +02:00
|
|
|
@@ -482,6 +482,15 @@ public class Warden extends Monster implements VibrationSystem {
|
2022-06-14 12:34:41 +02:00
|
|
|
@VisibleForTesting
|
|
|
|
public void increaseAngerAt(@Nullable Entity entity, int amount, boolean listening) {
|
|
|
|
if (!this.isNoAi() && this.canTargetEntity(entity)) {
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Add WardenAngerChangeEvent
|
2022-06-14 12:34:41 +02:00
|
|
|
+ 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));
|
2023-06-08 22:56:13 +02:00
|
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event);
|
2022-06-14 12:34:41 +02:00
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ amount = event.getNewAnger() - activeAnger;
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Add WardenAngerChangeEvent
|
2022-06-14 12:34:41 +02:00
|
|
|
WardenAi.setDigCooldown(this);
|
2024-04-24 22:32:38 +02:00
|
|
|
boolean flag1 = !(this.getTarget() instanceof Player);
|
2022-06-25 22:26:00 +02:00
|
|
|
int j = this.angerManagement.increaseAnger(entity, amount);
|