Update Patch to match suggestion

neoforged · Jan 20, 2025 · 82a86ab · 82a86ab
1 parent 65d9e85
commit 82a86ab
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/patches/net/minecraft/world/entity/npc/VillagerTrades.java.patch b/patches/net/minecraft/world/entity/npc/VillagerTrades.java.patch
@@ -1,22 +1,18 @@
 --- a/net/minecraft/world/entity/npc/VillagerTrades.java
 +++ b/net/minecraft/world/entity/npc/VillagerTrades.java
-@@ -1484,9 +_,6 @@
+@@ -1484,6 +_,7 @@
          private final int villagerXp;
 
          public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
--            BuiltInRegistries.VILLAGER_TYPE.stream().filter(p_35680_ -> !p_35672_.containsKey(p_35680_)).findAny().ifPresent(p_339515_ -> {
--                throw new IllegalStateException("Missing trade for villager type: " + BuiltInRegistries.VILLAGER_TYPE.getKey(p_339515_));
--            });
-             this.trades = p_35672_;
-             this.cost = p_35669_;
-             this.maxUses = p_35670_;
-@@ -1498,6 +_,9 @@
++            if (false) // Neo: disable this check so that mods can add custom villager
+             BuiltInRegistries.VILLAGER_TYPE.stream().filter(p_35680_ -> !p_35672_.containsKey(p_35680_)).findAny().ifPresent(p_339515_ -> {
+                 throw new IllegalStateException("Missing trade for villager type: " + BuiltInRegistries.VILLAGER_TYPE.getKey(p_339515_));
+             });
+@@ -1498,6 +_,7 @@
          public MerchantOffer getOffer(Entity p_219685_, RandomSource p_219686_) {
              if (p_219685_ instanceof VillagerDataHolder villagerdataholder) {
                  ItemCost itemcost = new ItemCost(this.trades.get(villagerdataholder.getVillagerData().getType()), this.cost);
-+                if (itemcost.itemStack().isEmpty()) {
-+                    return null;
-+                }
++                if (itemcost.itemStack().isEmpty()) return null; // Neo: add a check for custom villager 
                  return new MerchantOffer(itemcost, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, 0.05F);
              } else {
                  return null;