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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@57c202e0 Allow adventure nbt codec to parse all tags
PaperMC/Paper@4d854e66 Disable MC-163962 fix by default
PaperMC/Paper@dda39a0f 1.21.7-rc2
PaperMC/Paper@7f609243 Configuration API (#12301)
PaperMC/Paper@371a4225 Remove a bunch more experimental annotations (#12712)
PaperMC/Paper@a9f74cbf Readd dropped diff during 1.21.6
This commit is contained in:
granny
2025-06-30 12:06:18 -07:00
parent a1bdc94600
commit f5b99917e6
3 changed files with 6 additions and 5 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.7-R0.1-SNAPSHOT version = 1.21.7-R0.1-SNAPSHOT
mcVersion = 1.21.7-rc2 mcVersion = 1.21.7-rc2
paperCommit = ab1b472c5663f4123632770db8ea509b9be49e20 paperCommit = a9f74cbf6e740c76ad812abde855434abc9526a0
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

2
purpur-server/minecraft-patches/sources/net/minecraft/server/commands/GiveCommand.java.patch
View File

@@ -6,5 +6,5 @@
boolean flag = serverPlayer.getInventory().add(itemStack1); boolean flag = serverPlayer.getInventory().add(itemStack1);
+ if (org.purpurmc.purpur.PurpurConfig.disableGiveCommandDrops) continue; // Purpur - add config option for toggling give command dropping + if (org.purpurmc.purpur.PurpurConfig.disableGiveCommandDrops) continue; // Purpur - add config option for toggling give command dropping
if (flag && itemStack1.isEmpty()) { if (flag && itemStack1.isEmpty()) {
ItemEntity itemEntity = serverPlayer.drop(itemStack, false); ItemEntity itemEntity = serverPlayer.drop(itemStack, false, false, false, null); // Paper - do not fire PlayerDropItemEvent for /give command
if (itemEntity != null) { if (itemEntity != null) {

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() {