mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 14:06:17 +01:00
21 lines
977 B
Diff
21 lines
977 B
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
||
|
|
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 9ce1c1092970618a204f87c673144152afbade99..fa74813e0fe76612023830b2fc41d41aa0b4f10e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
|
||
|
|
@@ -109,7 +109,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() {
|