Minecraft 1.9.4

By: md_5 <git@md-5.net>

paper-server/nms-patches/EntityVillager.patch

@@ -1,19 +1,21 @@
 --- a/net/minecraft/server/EntityVillager.java
 +++ b/net/minecraft/server/EntityVillager.java
-@@ -2,6 +2,12 @@
- 
+@@ -3,6 +3,14 @@
  import java.util.Iterator;
  import java.util.Random;
+ import javax.annotation.Nullable;
++// CraftBukkit start
 +import org.bukkit.Bukkit;
-+import org.bukkit.craftbukkit.entity.CraftVillager; // CraftBukkit
++import org.bukkit.craftbukkit.entity.CraftVillager;
 +import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
 +import org.bukkit.entity.Villager;
 +import org.bukkit.event.entity.VillagerAcquireTradeEvent;
 +import org.bukkit.event.entity.VillagerReplenishTradeEvent;
++// CraftBukkit end
  
  public class EntityVillager extends EntityAgeable implements IMerchant, NPC {
  
-@@ -30,7 +36,7 @@
+@@ -31,7 +39,7 @@
  
      public EntityVillager(World world, int i) {
          super(world);
@@ -22,7 +24,7 @@
          this.setProfession(i);
          this.setSize(0.6F, 1.95F);
          ((Navigation) this.getNavigation()).a(true);
-@@ -109,7 +115,14 @@
+@@ -110,7 +118,14 @@
                          MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
  
                          if (merchantrecipe.h()) {
@@ -38,7 +40,7 @@
                          }
                      }
  
-@@ -401,7 +414,20 @@
+@@ -402,7 +417,20 @@
              for (int l = 0; l < k; ++l) {
                  EntityVillager.IMerchantRecipeOption entityvillager_imerchantrecipeoption = aentityvillager_imerchantrecipeoption3[l];