diff --git a/lophine-server/minecraft-patches/features/0007-Add-config-to-allow-infinite-trade.patch b/lophine-server/minecraft-patches/features/0007-Add-config-to-allow-infinite-trade.patch index 20992bb..e7f84c0 100644 --- a/lophine-server/minecraft-patches/features/0007-Add-config-to-allow-infinite-trade.patch +++ b/lophine-server/minecraft-patches/features/0007-Add-config-to-allow-infinite-trade.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config to allow infinite trade diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java -index 79242037e868a140513f032e74e8594c0c6ff41c..adf4b57aeedf80128dfa03c790616f54062b33e7 100644 +index 79242037e868a140513f032e74e8594c0c6ff41c..8570c5089b605125680f8558ae201550df2d0a47 100644 --- a/net/minecraft/world/entity/npc/Villager.java +++ b/net/minecraft/world/entity/npc/Villager.java @@ -490,8 +490,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @@ -18,7 +18,7 @@ index 79242037e868a140513f032e74e8594c0c6ff41c..adf4b57aeedf80128dfa03c790616f54 Player tradingPlayer = this.getTradingPlayer(); + if (fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade) { + for (MerchantOffer merchantOffer : offers) { -+ merchantOffer.maxUses = 16384; ++ merchantOffer.maxUses = 524288; + } + } + // Lophine end - infinite trade @@ -26,7 +26,7 @@ index 79242037e868a140513f032e74e8594c0c6ff41c..adf4b57aeedf80128dfa03c790616f54 tradingPlayer.sendMerchantOffers( tradingPlayer.containerMenu.containerId, diff --git a/net/minecraft/world/item/trading/Merchant.java b/net/minecraft/world/item/trading/Merchant.java -index 6e2fa442ddcd4ef3c4fe789b9ebac9dd409c9de7..a876335e26daec9a9a3a2f00ee5cb23cfd913aa6 100644 +index 6e2fa442ddcd4ef3c4fe789b9ebac9dd409c9de7..28d743cc7beeb92a33683b8eea84096f94d90fb2 100644 --- a/net/minecraft/world/item/trading/Merchant.java +++ b/net/minecraft/world/item/trading/Merchant.java @@ -42,7 +42,14 @@ public interface Merchant { @@ -38,7 +38,7 @@ index 6e2fa442ddcd4ef3c4fe789b9ebac9dd409c9de7..a876335e26daec9a9a3a2f00ee5cb23c + MerchantOffers offers = this.getOffers().copy(); + if (fun.bm.lophine.config.modules.misc.VillagerConfig.villagerInfiniteTrade) { + for (MerchantOffer merchantOffer : offers) { -+ merchantOffer.maxUses = 16384; ++ merchantOffer.maxUses = 5242884; + } + } + // Lophine end - infinite trade diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java index 9b81e2e..0fd4d76 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/VillagerConfig.java @@ -7,7 +7,7 @@ import me.earthme.luminol.config.flags.ConfigInfo; public class VillagerConfig implements IConfigModule { @ConfigInfo(baseName = "villager-infinite-trade", comments = """ - Allow villager infinite trade (limit of 16384 times) + Allow villager infinite trade (limit of 524288 times) ---- we won't edit saved data, only edit in send data to client.""") public static boolean villagerInfiniteTrade = false;