#1045: Revert changes to persistence required checks

By: DerFrZocker <derrieple@gmail.com>

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

@@ -50,21 +50,20 @@
      }
  
      @Override
-@@ -191,8 +204,11 @@
+@@ -191,8 +204,10 @@
          this.conversionStarter = uuid;
          this.villagerConversionTime = i;
          this.getEntityData().set(EntityZombieVillager.DATA_CONVERTING_ID, true);
 -        this.removeEffect(MobEffects.WEAKNESS);
 -        this.addEffect(new MobEffect(MobEffects.DAMAGE_BOOST, i, Math.min(this.level.getDifficulty().getId() - 1, 0)));
 +        // CraftBukkit start
-+        this.setPersistenceRequired(true); // CraftBukkit - SPIGOT-4684 update persistence
 +        this.removeEffect(MobEffects.WEAKNESS, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
 +        this.addEffect(new MobEffect(MobEffects.DAMAGE_BOOST, i, Math.min(this.level.getDifficulty().getId() - 1, 0)), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
 +        // CraftBukkit end
          this.level.broadcastEntityEvent(this, (byte) 16);
      }
  
-@@ -209,7 +225,13 @@
+@@ -209,7 +224,13 @@
      }
  
      private void finishConversion(WorldServer worldserver) {
@@ -79,7 +78,7 @@
          EnumItemSlot[] aenumitemslot = EnumItemSlot.values();
          int i = aenumitemslot.length;
  
-@@ -224,7 +246,9 @@
+@@ -224,7 +245,9 @@
                      double d0 = (double) this.getEquipmentDropChance(enumitemslot);
  
                      if (d0 > 1.0D) {
@@ -89,7 +88,7 @@
                      }
                  }
              }
-@@ -250,7 +274,7 @@
+@@ -250,7 +273,7 @@
              }
          }