Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Final 1.21.6 Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4d854e66 Disable MC-163962 fix by default
This commit is contained in:
granny
2025-06-30 11:58:16 -07:00
parent 051566db7f
commit a112b6aca7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.6-R0.1-SNAPSHOT version = 1.21.6-R0.1-SNAPSHOT
mcVersion = 1.21.6 mcVersion = 1.21.6
paperCommit = 57c202e01516b653aea9c7e050eaded1448863e5 paperCommit = 4d854e66b80dad9898d71a0f0b1f83cd39b97119
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

7
purpur-server/minecraft-patches/sources/net/minecraft/world/item/trading/MerchantOffer.java.patch
View File

@@ -1,16 +1,17 @@
--- a/net/minecraft/world/item/trading/MerchantOffer.java --- a/net/minecraft/world/item/trading/MerchantOffer.java
+++ b/net/minecraft/world/item/trading/MerchantOffer.java +++ b/net/minecraft/world/item/trading/MerchantOffer.java
@@ -143,7 +_,12 @@ @@ -143,8 +_,13 @@
} }
public void updateDemand() { public void updateDemand() {
- this.demand = Math.max(0, this.demand + this.uses - (this.maxUses - this.uses)); // Paper - Fix MC-163962
+ // Purpur start - Configurable minimum demand for trades + // Purpur start - Configurable minimum demand for trades
+ this.updateDemand(0); + this.updateDemand(0);
+ } + }
+ public void updateDemand(int minimumDemand) { + public void updateDemand(int minimumDemand) {
+ this.demand = Math.max(minimumDemand, this.demand + this.uses - (this.maxUses - this.uses)); // Paper - Fix MC-163962
+ // Purpur end - Configurable minimum demand for trades + // Purpur end - Configurable minimum demand for trades
this.demand = this.demand + this.uses - (this.maxUses - this.uses);
- if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.preventNegativeVillagerDemand) this.demand = Math.max(0, this.demand); // Paper - Fix MC-163962
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.preventNegativeVillagerDemand) this.demand = Math.max(minimumDemand, this.demand); // Paper - Fix MC-163962 // Purpur - Configurable minimum demand for trades
} }
public ItemStack assemble() { public ItemStack assemble() {