From c1bd122e355f340a68c0a4556762677024a533a3 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Tue, 31 May 2016 20:55:17 +1000
Subject: [PATCH] SPIGOT-2336: Zombie.setVillager(Z)V

By: md_5 <git@md-5.net>
---
 .../java/org/bukkit/craftbukkit/entity/CraftZombie.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
index c9e68350fe..6431d041a1 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
@@ -40,7 +40,11 @@ public class CraftZombie extends CraftMonster implements Zombie {
     }
 
     public void setVillager(boolean flag) {
-        getHandle().setVillagerType(0);
+        if (flag) {
+            getHandle().setVillagerType(0);
+        } else {
+            getHandle().clearVillagerType();
+        }
     }
 
     @Override