From b8520cb85d7ef9894ae43596e65e06b5503c4dd4 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 12 Jan 2025 17:48:17 -0800
Subject: [PATCH] port missing Iron golem poppy calms anger goal for generated
 api

---
 .../0005-Iron-golem-poppy-calms-anger.patch    | 18 ------------------
 .../paper/entity/ai/VanillaGoal.java.patch     |  5 ++++-
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch

diff --git a/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch b/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
deleted file mode 100644
index bae54e389..000000000
--- a/patches/generated-api/0005-Iron-golem-poppy-calms-anger.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 13 May 2021 21:38:01 -0500
-Subject: [PATCH] Iron golem poppy calms anger
-
-
-diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index 6eea8fbe575c4570c2b760c9828f8ec5b81c7202..e7795889133063ac165d5b4783ddcbcbb442f189 100644
---- a/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-+++ b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -450,6 +450,7 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
-     GoalKey<Drowned> DROWNED_ATTACK_VILLAGER = GoalKey.of(Drowned.class, NamespacedKey.minecraft("drowned_attack_villager"));
-     GoalKey<Zombie> ZOMBIE_ATTACK_VILLAGER = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack_villager"));
-     GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
-+    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
-     // Purpur end
- 
-     private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
diff --git a/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch b/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch
index 7cc7c3964..0173a42d9 100644
--- a/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch
+++ b/purpur-api-generator/paper-patches/files/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java.patch
@@ -1,6 +1,6 @@
 --- a/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -441,6 +_,23 @@
+@@ -441,6 +_,26 @@
  
      GoalKey<Zombie> ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class);
  
@@ -20,6 +20,9 @@
 +    // Purpur start - Configurable chance for wolves to spawn rabid
 +    GoalKey<Wolf> AVOID_RABID_WOLF = GoalKey.of(Wolf.class, NamespacedKey.minecraft("avoid_rabid_wolf"));
 +    // Purpur end - Configurable chance for wolves to spawn rabid
++    // Purpur start - Iron golem poppy calms anger
++    GoalKey<IronGolem> RECEIVE_FLOWER = GoalKey.of(IronGolem.class, NamespacedKey.minecraft("receive_flower"));
++    // Purpur end - Iron golem poppy calms anger
 +
      private static <T extends Mob> GoalKey<T> create(final String key, final Class<T> type) {
          return GoalKey.of(type, NamespacedKey.minecraft(key));