--- a/net/minecraft/world/entity/monster/EntityGuardian.java
+++ b/net/minecraft/world/entity/monster/EntityGuardian.java
@@ -63,6 +63,7 @@
     private boolean clientSideTouchedGround;
     @Nullable
     public PathfinderGoalRandomStroll randomStrollGoal;
+    public EntityGuardian.PathfinderGoalGuardianAttack guardianAttackGoal; // CraftBukkit - add field
 
     public EntityGuardian(EntityTypes<? extends EntityGuardian> entitytypes, World world) {
         super(entitytypes, world);
@@ -78,7 +79,7 @@
         PathfinderGoalMoveTowardsRestriction pathfindergoalmovetowardsrestriction = new PathfinderGoalMoveTowardsRestriction(this, 1.0D);
 
         this.randomStrollGoal = new PathfinderGoalRandomStroll(this, 1.0D, 80);
-        this.goalSelector.addGoal(4, new EntityGuardian.PathfinderGoalGuardianAttack(this));
+        this.goalSelector.addGoal(4, guardianAttackGoal = new EntityGuardian.PathfinderGoalGuardianAttack(this)); // CraftBukkit - assign field
         this.goalSelector.addGoal(5, pathfindergoalmovetowardsrestriction);
         this.goalSelector.addGoal(7, this.randomStrollGoal);
         this.goalSelector.addGoal(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));