From 2322cacb40127be4a967e0778480a0870a7f53e3 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 7 Aug 2019 23:47:02 +0800
Subject: [PATCH] Clear goals on behavior change for villagers

---
 .../java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java | 1 -
 .../net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
index 8952bc205..265704544 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/PigController.java
@@ -38,7 +38,6 @@ public class PigController extends MobEntityController {
 
     public static class EntityPigNPC extends EntityPig implements NPCHolder {
         boolean calledNMSHeight = false;
-
         private final CitizensNPC npc;
 
         public EntityPigNPC(EntityTypes<? extends EntityPig> types, World world) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
index 0b3085af5..ef9776416 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/VillagerController.java
@@ -235,6 +235,7 @@ public class VillagerController extends MobEntityController {
                 }
                 if (this.behaviorMap.size() > 0) {
                     this.behaviorMap.clear();
+                    NMSImpl.clearGoals(goalSelector, targetSelector);
                 }
             }
             super.mobTick();