Repackage NMS

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

paper-server/nms-patches/net/minecraft/world/entity/monster/EntityZombieVillager.patch

@@ -1,10 +1,11 @@
---- a/net/minecraft/server/EntityZombieVillager.java
-+++ b/net/minecraft/server/EntityZombieVillager.java
-@@ -6,6 +6,12 @@
- import javax.annotation.Nullable;
+--- a/net/minecraft/world/entity/monster/EntityZombieVillager.java
++++ b/net/minecraft/world/entity/monster/EntityZombieVillager.java
+@@ -47,6 +47,13 @@
+ import net.minecraft.world.level.block.Blocks;
  import org.apache.logging.log4j.Logger;
  
 +// CraftBukkit start
++import net.minecraft.server.MinecraftServer;
 +import org.bukkit.entity.ZombieVillager;
 +import org.bukkit.event.entity.CreatureSpawnEvent;
 +import org.bukkit.event.entity.EntityTransformEvent;
@@ -13,7 +14,7 @@
  public class EntityZombieVillager extends EntityZombie implements VillagerDataHolder {
  
      public static final DataWatcherObject<Boolean> CONVERTING = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.i);
-@@ -15,6 +21,7 @@
+@@ -56,6 +63,7 @@
      private NBTBase bp;
      private NBTTagCompound bq;
      private int br;
@@ -21,7 +22,7 @@
  
      public EntityZombieVillager(EntityTypes<? extends EntityZombieVillager> entitytypes, World world) {
          super(entitytypes, world);
-@@ -31,7 +38,7 @@
+@@ -72,7 +80,7 @@
      @Override
      public void saveData(NBTTagCompound nbttagcompound) {
          super.saveData(nbttagcompound);
@@ -30,7 +31,7 @@
          Logger logger = EntityZombieVillager.LOGGER;
  
          logger.getClass();
-@@ -87,6 +94,10 @@
+@@ -128,6 +136,10 @@
      public void tick() {
          if (!this.world.isClientSide && this.isAlive() && this.isConverting()) {
              int i = this.getConversionProgress();
@@ -41,7 +42,7 @@
  
              this.conversionTime -= i;
              if (this.conversionTime <= 0) {
-@@ -95,6 +106,7 @@
+@@ -136,6 +148,7 @@
          }
  
          super.tick();
@@ -49,7 +50,7 @@
      }
  
      @Override
-@@ -138,13 +150,22 @@
+@@ -179,13 +192,22 @@
          this.conversionPlayer = uuid;
          this.conversionTime = i;
          this.getDataWatcher().set(EntityZombieVillager.CONVERTING, true);
@@ -75,7 +76,7 @@
          EnumItemSlot[] aenumitemslot = EnumItemSlot.values();
          int i = aenumitemslot.length;
  
-@@ -185,7 +206,7 @@
+@@ -226,7 +248,7 @@
              }
          }