Update to Minecraft 1.12-pre2

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

paper-server/nms-patches/EntityVillager.patch

@@ -15,7 +15,7 @@
  
  public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
  
-@@ -36,7 +44,7 @@
+@@ -37,7 +45,7 @@
  
      public EntityVillager(World world, int i) {
          super(world);
@@ -24,7 +24,7 @@
          this.setProfession(i);
          this.setSize(0.6F, 1.95F);
          ((Navigation) this.getNavigation()).a(true);
-@@ -118,7 +126,14 @@
+@@ -119,7 +127,14 @@
                          MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
  
                          if (merchantrecipe.h()) {
@@ -40,7 +40,7 @@
                          }
                      }
  
-@@ -454,7 +469,20 @@
+@@ -460,7 +475,20 @@
                  for (int l = 0; l < k; ++l) {
                      EntityVillager.IMerchantRecipeOption entityvillager_imerchantrecipeoption = aentityvillager_imerchantrecipeoption3[l];