aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0418-Fix-villager-trading-demand-MC-163962.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0418-Fix-villager-trading-demand-MC-163962.patch')
-rw-r--r--patches/server/0418-Fix-villager-trading-demand-MC-163962.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0418-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0418-Fix-villager-trading-demand-MC-163962.patch
new file mode 100644
index 0000000000..fb5e330854
--- /dev/null
+++ b/patches/server/0418-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 987e65332058f364fcef0a29c97b206b14ad6457..8b46e494ecd0cce5ab0b2bf8e50cf50dc7e2a7e5 100644
+--- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
++++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
+@@ -113,7 +113,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
+ }
+
+ public ItemStack assemble() {