Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 19:07:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lobotomize stuck villagers

Browse Source
This commit is contained in:
William Blake Galbreath
2025-01-12 14:38:06 -08:00
committed by granny
parent 9cf9db1dbd
commit ce589297ea
19 changed files with 205 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
purpur-server/minecraft-patches/features/0007-Villagers-follow-emerald-blocks.patch
View File

@@ -44,10 +44,10 @@ index a71d16d968bb90fd7aca6f01a3dd56df4f9a7ce6..b4e79cac5611942240ce85120f7bbee3
@Override
public CraftMerchant getCraftMerchant() {
diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
index 557140401074dec60cf862a29570b2f0a5de64a1..c30fc25536277b487030effafecebf43390934cf 100644
index c71d0f8efacb60e49395567fdc0c1c1e6e6f5aa8..2f685a186b2dc27e70cddd5c4951c27e7ee3ef53 100644
--- a/net/minecraft/world/entity/npc/Villager.java
+++ b/net/minecraft/world/entity/npc/Villager.java
@@ -219,6 +219,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -265,6 +265,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this));
@@ -55,7 +55,7 @@ index 557140401074dec60cf862a29570b2f0a5de64a1..c30fc25536277b487030effafecebf43
}
// Purpur end - Ridables
@@ -227,6 +228,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -273,6 +274,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);
@@ -63,7 +63,7 @@ index 557140401074dec60cf862a29570b2f0a5de64a1..c30fc25536277b487030effafecebf43
}
// Purpur end - Configurable entity base attributes
@@ -295,7 +297,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -341,7 +343,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
}
public static AttributeSupplier.Builder createAttributes() {
@@ -73,7 +73,7 @@ index 557140401074dec60cf862a29570b2f0a5de64a1..c30fc25536277b487030effafecebf43
public boolean assignProfessionWhenSpawned() {
diff --git a/net/minecraft/world/entity/npc/WanderingTrader.java b/net/minecraft/world/entity/npc/WanderingTrader.java
index 31449094c6395857289dd56482e8b3902bac2b63..cef51ce86dcbc5ec01bfcbcb487325b55779be52 100644
index b5af32a431b5ffe20b32bd82ccfae9b8343d0592..f9755f36f7863b9742fe5b840a8130891ddff7c7 100644
--- a/net/minecraft/world/entity/npc/WanderingTrader.java
+++ b/net/minecraft/world/entity/npc/WanderingTrader.java
@@ -97,9 +97,16 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill