Update to Minecraft 1.17.1

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

paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch

@@ -51,15 +51,6 @@
              }
          }
  
-@@ -302,7 +310,7 @@
-         }
-     }
- 
--    private void fT() {
-+    public void fT() {
-         this.t(40);
-         if (!this.level.isClientSide()) {
-             this.playSound(SoundEffects.VILLAGER_NO, this.getSoundVolume(), this.ep());
 @@ -444,7 +452,14 @@
              while (iterator.hasNext()) {
                  MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
@@ -96,7 +87,7 @@
 +            }
 +            worldserver.addAllEntities(entitywitch, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
 +            // CraftBukkit end
-             this.fZ();
+             this.ga();
              this.die();
          } else {
 @@ -834,6 +854,13 @@