Update according to the feedback

patches/server/0047-Villagers-follow-emerald-blocks.patch

@@ -43,68 +43,55 @@ index 5f656fc726a1dc5f42657095a2f2b7cf85b92d7c..6c74cf1dea99b3b967b8c3d76f405f82
      // CraftBukkit start
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 37c26008486ffdf7f1d6bdfd0253067a1c6bf942..90c898e4e3c2a38fd5c881bf08f3df0644238e71 100644
+index 37c26008486ffdf7f1d6bdfd0253067a1c6bf942..fd7c6835d3153c40a23c63f197c68cbfef2ceae2 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -175,14 +175,18 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -175,6 +175,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
 +        if (level().purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, TEMPT_ITEMS, false));
      }
      // Purpur end
 
-+    // Purpur start
-     @Override
+@@ -182,6 +183,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.villagerMaxHealth);
          this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.villagerScale);
-+        this.getAttribute(Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.villagerTemptRange);
++        this.getAttribute(Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.villagerTemptRange); // Purpur
      }
-+    // Purpur end
 
      @Override
-     public Brain<Villager> getBrain() {
-@@ -245,7 +249,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -245,7 +247,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
 
      public static AttributeSupplier.Builder createAttributes() {
 -        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5D);
-+        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5D)
-+            .add(Attributes.TEMPT_RANGE); // Purpur
++        return Mob.createMobAttributes().add(Attributes.MOVEMENT_SPEED, 0.5D).add(Attributes.TEMPT_RANGE); // Purpur - add TEMPT_RANGE
      }
 
      public boolean assignProfessionWhenSpawned() {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index f741aca818bc983b034b3ac9864c1d71c714f9b4..8bea93ea99546c0e79572e6adb8f8244eb79e87d 100644
+index f741aca818bc983b034b3ac9864c1d71c714f9b4..912660873f60b00d354f0be5d0c8f74e284d61c7 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -17,6 +17,8 @@ import net.minecraft.world.entity.AgeableMob;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.entity.ExperienceOrb;
- import net.minecraft.world.entity.Mob;
-+import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
-+import net.minecraft.world.entity.ai.attributes.Attributes;
- import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
- import net.minecraft.world.entity.ai.goal.FloatGoal;
- import net.minecraft.world.entity.ai.goal.Goal;
-@@ -92,8 +94,15 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -92,8 +92,15 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
      @Override
      public void initAttributes() {
          this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.wanderingTraderMaxHealth);
-+        this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.wanderingTraderTemptRange);
++        this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.wanderingTraderTemptRange); // Purpur
      }
 
 +    // Purpur start
-+    public static AttributeSupplier.Builder createAttributes() {
-+        return Mob.createMobAttributes().add(Attributes.TEMPT_RANGE);
++    public static net.minecraft.world.entity.ai.attributes.AttributeSupplier.Builder createAttributes() {
++        return Mob.createMobAttributes().add(net.minecraft.world.entity.ai.attributes.Attributes.TEMPT_RANGE);
 +    }
 +    // Purpur end
 +
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
-@@ -114,6 +123,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -114,6 +121,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          this.goalSelector.addGoal(1, new PanicGoal(this, 0.5D));
          this.goalSelector.addGoal(1, new LookAtTradingPlayerGoal(this));
          this.goalSelector.addGoal(2, new WanderingTrader.WanderToPositionGoal(this, 2.0D, 0.35D));

patches/server/0048-Allow-leashing-villagers.patch

@@ -17,7 +17,7 @@ index 1e639ab3e48d884ee6e2c33be85dde51e24183b6..75b0a66be9f94c82a02f714860ae8bee
                      // Paper start - Expand EntityUnleashEvent
                      org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials());
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 90c898e4e3c2a38fd5c881bf08f3df0644238e71..13e0efb3d9a4b192313a9a700dab6b3b3c10c58a 100644
+index fd7c6835d3153c40a23c63f197c68cbfef2ceae2..aab9c6cbe88e9dea7c17d30e16aaf6a0bc417525 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -177,6 +177,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -31,12 +31,12 @@ index 90c898e4e3c2a38fd5c881bf08f3df0644238e71..13e0efb3d9a4b192313a9a700dab6b3b
 +    }
      // Purpur end
 
-     // Purpur start
+     @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 8bea93ea99546c0e79572e6adb8f8244eb79e87d..a426309201d573440679862f0ace70a47a955937 100644
+index 912660873f60b00d354f0be5d0c8f74e284d61c7..2f443b0c06a6f1c8db52900203dd1ef46601ef45 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -89,6 +89,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -87,6 +87,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
      public boolean isControllable() {
          return level().purpurConfig.wanderingTraderControllable;
      }

patches/server/0074-Configurable-villager-breeding.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable villager breeding
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 13e0efb3d9a4b192313a9a700dab6b3b3c10c58a..17855ea5f5de683a1e3ea3c077a87ff83344db4f 100644
+index aab9c6cbe88e9dea7c17d30e16aaf6a0bc417525..d9cfbd7f169e469ba2b0e10e79143f6b5037dd7e 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -765,7 +765,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -762,7 +762,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
 
      @Override
      public boolean canBreed() {

patches/server/0106-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch

@@ -136,10 +136,10 @@ index a0e0692d17760f440fe81d52887284c787e562db..ab9bebc07b5228dbc0d3ba4b0f7d1bbe
              brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 17855ea5f5de683a1e3ea3c077a87ff83344db4f..042abe197b2110c96fbe5789bed234676348cf91 100644
+index d9cfbd7f169e469ba2b0e10e79143f6b5037dd7e..37355316b4ac3bbfc0f8554414aa49fe5e2a36b6 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -227,7 +227,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -225,7 +225,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              brain.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5F));
          } else {
              brain.setSchedule(Schedule.VILLAGER_DEFAULT);
@@ -148,7 +148,7 @@ index 17855ea5f5de683a1e3ea3c077a87ff83344db4f..042abe197b2110c96fbe5789bed23467
          }
 
          brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F));
-@@ -944,6 +944,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -941,6 +941,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
 
      public boolean hasFarmSeeds() {
          return this.getInventory().hasAnyMatching((itemstack) -> {

patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch

@@ -395,7 +395,7 @@ index 6b2e27e2f8aeccfc4d84c73be0fa5a04f5a962e2..96a6f13fe6ea02412974fd4c8cf01546
          this.entityData.set(Turtle.HOME_POS, pos);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 7343c5a81ddf7db1e9e434796489fd8a98b9a70c..91474a8a795a278493c07002bd99ec75effa659c 100644
+index 89566a88a98af2e4ec2b062ed12d4828a32b576d..6e3ed974f6e55aed8ae83fc90e8ae8a7ee2bb8a8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -218,6 +218,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -1167,12 +1167,12 @@ index 6459e588e6feb6d7bcf999e36b658bbad4069af2..9c196b0cf49cb6f69bd17748fd13ce59
          return Monster.createMonsterAttributes()
              .add(Attributes.MAX_HEALTH, 50.0)
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 042abe197b2110c96fbe5789bed234676348cf91..8cff86cda42abe3574bf1bbd376f94598cbd99b7 100644
+index 37355316b4ac3bbfc0f8554414aa49fe5e2a36b6..b6f9b9e67ab906720b416e22c19fb31271c7dd7f 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -193,6 +193,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -191,6 +191,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+         this.getAttribute(Attributes.TEMPT_RANGE).setBaseValue(this.level().purpurConfig.villagerTemptRange); // Purpur
      }
-     // Purpur end
 
 +    @Override
 +    public boolean isSensitiveToWater() {
@@ -1183,10 +1183,10 @@ index 042abe197b2110c96fbe5789bed234676348cf91..8cff86cda42abe3574bf1bbd376f9459
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index a426309201d573440679862f0ace70a47a955937..1b1c66cd72faad4869f8e165c7133fa84dbed55c 100644
+index 2f443b0c06a6f1c8db52900203dd1ef46601ef45..4ce7687154ac4c7188ea15325a7d2117ca98b79a 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -108,6 +108,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -106,6 +106,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
      }
      // Purpur end
 

patches/server/0139-Add-config-for-villager-trading.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for villager trading
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 8cff86cda42abe3574bf1bbd376f94598cbd99b7..c6fc1c361bf278757164c85d727caee7eb69722f 100644
+index b6f9b9e67ab906720b416e22c19fb31271c7dd7f..9efd57ffc088e5239a0c94bd8da30c6fd32a5ad6 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -373,6 +373,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -370,6 +370,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
                      }
 
                      if (level().purpurConfig.villagerRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur
@@ -17,10 +17,10 @@ index 8cff86cda42abe3574bf1bbd376f94598cbd99b7..c6fc1c361bf278757164c85d727caee7
                  }
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 1b1c66cd72faad4869f8e165c7133fa84dbed55c..1598ca21c6c1b588ab774bb5f0e9ce063620f553 100644
+index 4ce7687154ac4c7188ea15325a7d2117ca98b79a..5ffe9bf4e325570fef0b23d3fcb0b5d9afac4107 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -165,8 +165,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -163,8 +163,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                      return tryRide(player, hand, InteractionResult.CONSUME); // Purpur
                  }
                  if (level().purpurConfig.wanderingTraderRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur

patches/server/0144-Option-to-make-doors-require-redstone.patch

@@ -36,10 +36,10 @@ index 3513b15f6622bfc134ecfcd9129f81a8acc2c601..6e70579a58a1bf906b176b81713e5531
                      } else {
                          DoorBlock blockdoor = (DoorBlock) iblockdata.getBlock();
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 1598ca21c6c1b588ab774bb5f0e9ce063620f553..78901394e595caa93685a7aed66b0ea704a6e009 100644
+index 5ffe9bf4e325570fef0b23d3fcb0b5d9afac4107..14577fb82069750d513c13ebb22c35d097feefd5 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -166,8 +166,8 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -164,8 +164,8 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
                  }
                  if (level().purpurConfig.wanderingTraderRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur
                  if (this.level().purpurConfig.wanderingTraderAllowTrading) { // Purpur

patches/server/0206-Option-for-beds-to-explode-on-villager-sleep.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option for beds to explode on villager sleep
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index c6fc1c361bf278757164c85d727caee7eb69722f..ccf5a2fd1d3daa9e57d9eef422f6f053ab91849b 100644
+index 9efd57ffc088e5239a0c94bd8da30c6fd32a5ad6..ba42a5643f3cae5dcf392927733fa79e2b47f822 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -1076,6 +1076,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -1073,6 +1073,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
 
      @Override
      public void startSleeping(BlockPos pos) {

patches/server/0216-Mobs-always-drop-experience.patch

@@ -389,7 +389,7 @@ index 96a6f13fe6ea02412974fd4c8cf015467ef8e02c..c9e307452a097329c26893673055cfb7
          this.entityData.set(Turtle.HOME_POS, pos);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 15675dd5df0ec88636019ac57fd0540bef3af5f6..499e3294f8dd19fb3802f521cb7d24d0998c8aeb 100644
+index 5fea6f7e9b7c5d2b4845effdd1b9d40b5b8033b3..420345f130a40c4f59a021a4bdce3e218dc87cde 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -223,6 +223,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -1125,10 +1125,10 @@ index 9c196b0cf49cb6f69bd17748fd13ce5960094f88..bc3b0eb21200eae7e419b2571871b36f
          return Monster.createMonsterAttributes()
              .add(Attributes.MAX_HEALTH, 50.0)
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index ccf5a2fd1d3daa9e57d9eef422f6f053ab91849b..0a255bd73213815e773dd867c44235d08ebb829b 100644
+index ba42a5643f3cae5dcf392927733fa79e2b47f822..5e693068ed50e4d732fa023c82a480dd89378a3c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -198,6 +198,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -196,6 +196,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return this.level().purpurConfig.villagerTakeDamageFromWater;
      }
 
@@ -1141,10 +1141,10 @@ index ccf5a2fd1d3daa9e57d9eef422f6f053ab91849b..0a255bd73213815e773dd867c44235d0
      public Brain<Villager> getBrain() {
          return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index 78901394e595caa93685a7aed66b0ea704a6e009..df9fa6dd4952a5dae47ef22bd10ef01b809da3fb 100644
+index 14577fb82069750d513c13ebb22c35d097feefd5..a8cbf8cc21b0835a040901ee34f240cd327ad073 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -113,6 +113,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -111,6 +111,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
          return this.level().purpurConfig.wanderingTraderTakeDamageFromWater;
      }
 

patches/server/0229-Configurable-minimum-demand-for-trades.patch

@@ -9,10 +9,10 @@ This patch adds a config option to allow the minimum demand to instead
 be configurable.
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 0a255bd73213815e773dd867c44235d08ebb829b..ec5cd4b14a59e853a16bcbee02d52edcc667015c 100644
+index 5e693068ed50e4d732fa023c82a480dd89378a3c..81b81b89bd624f27a1d195b9c6a6395b170cfaac 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -543,7 +543,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -540,7 +540,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          while (iterator.hasNext()) {
              MerchantOffer merchantrecipe = (MerchantOffer) iterator.next();