mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 05:55:44 +01:00
48 lines
2.9 KiB
Diff
48 lines
2.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Trigary <trigary0@gmail.com>
|
||
|
|
Date: Thu, 18 Mar 2021 21:38:01 +0100
|
||
|
|
Subject: [PATCH] fix PigZombieAngerEvent cancellation
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
||
|
|
index f85dfd8b57cf81ad7c6b12753fdd42e93f772f9e..16f4dbfd21a287bad3e10c174fa77a1cac771afa 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java
|
||
|
|
@@ -28,6 +28,7 @@ public abstract class Goal {
|
||
|
|
|
||
|
|
public void start() { this.start(); } public void start() {} // Paper - OBFHELPER
|
||
|
|
|
||
|
|
+ public final void onTaskResetObfHelper() { stop(); } // Paper - OBFHELPER
|
||
|
|
public void stop() {
|
||
|
|
onTaskReset(); // Paper
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||
|
|
index d1cbbfbf9d3c5e65785aad00c2292245a5de1422..d67a50740b1c6d4ecd49a5541d24d1e4bacb8887 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
|
||
|
|
@@ -49,6 +49,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||
|
|
private UUID persistentAngerTarget;
|
||
|
|
private static final IntRange ALERT_INTERVAL = TimeUtil.rangeOfSeconds(4, 6);
|
||
|
|
private int ticksUntilNextAlert;
|
||
|
|
+ private HurtByTargetGoal pathfinderGoalHurtByTarget; // Paper
|
||
|
|
|
||
|
|
public ZombifiedPiglin(EntityType<? extends ZombifiedPiglin> type, Level world) {
|
||
|
|
super(type, world);
|
||
|
|
@@ -69,7 +70,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||
|
|
protected void addBehaviourGoals() {
|
||
|
|
this.goalSelector.addGoal(2, new ZombieAttackGoal(this, 1.0D, false));
|
||
|
|
this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
|
||
|
|
- this.targetSelector.addGoal(1, new HurtByTargetGoal(this).setAlertOthers(new Class[0])); // CraftBukkit - decompile error
|
||
|
|
+ this.targetSelector.addGoal(1, pathfinderGoalHurtByTarget = new HurtByTargetGoal(this).setAlertOthers(new Class[0])); // CraftBukkit - decompile error // Paper - assign field
|
||
|
|
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::isAngryAt));
|
||
|
|
this.targetSelector.addGoal(3, new ResetUniversalAngerTargetGoal<>(this, true));
|
||
|
|
}
|
||
|
|
@@ -172,6 +173,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
|
||
|
|
this.level.getCraftServer().getPluginManager().callEvent(event);
|
||
|
|
if (event.isCancelled()) {
|
||
|
|
this.setPersistentAngerTarget(null);
|
||
|
|
+ pathfinderGoalHurtByTarget.onTaskResetObfHelper(); // Paper - clear goalTargets to fix cancellation
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
this.setRemainingPersistentAngerTime(event.getNewAnger());
|