diff options
| author | Nassim Jahnke <[email protected]> | 2024-12-05 11:18:29 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-12-05 12:20:56 +0100 |
| commit | e4e24f3335609b38f460ced71d18babcf11bf9cb (patch) | |
| tree | 51880d664b3444ce26d6f8cdeb3b8219e5616fca /patches/server/0355-Fix-villager-trading-demand-MC-163962.patch | |
| parent | c54c062e6ff742445bf7749c84106ca67090172d (diff) | |
| download | Paper-e4e24f3335609b38f460ced71d18babcf11bf9cb.tar.gz Paper-e4e24f3335609b38f460ced71d18babcf11bf9cb.zip | |
Move around patches again
Diffstat (limited to 'patches/server/0355-Fix-villager-trading-demand-MC-163962.patch')
| -rw-r--r-- | patches/server/0355-Fix-villager-trading-demand-MC-163962.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0355-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0355-Fix-villager-trading-demand-MC-163962.patch new file mode 100644 index 0000000000..bd7b6c4273 --- /dev/null +++ b/patches/server/0355-Fix-villager-trading-demand-MC-163962.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: chickeneer <[email protected]> +Date: Fri, 5 Jun 2020 20:02:04 -0500 +Subject: [PATCH] Fix villager trading demand - MC-163962 + +Prevent demand from going negative and tending to negative infinity + +diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java +index 44808589939afe50d8294269b7da12019acd2690..89982d25f60c8b60ba91e559ef88278f338fe215 100644 +--- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java ++++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java +@@ -124,7 +124,7 @@ public class MerchantOffer { + } + + public void updateDemand() { +- this.demand = this.demand + this.uses - (this.maxUses - this.uses); ++ this.demand = Math.max(0, this.demand + this.uses - (this.maxUses - this.uses)); // Paper - Fix MC-163962 + } + + public ItemStack assemble() { |