Updated Upstream (Bukkit/CraftBukkit/Spigot)

2025-08-17 21:33:49 -07:00 · 2021-12-31 19:05:42 -08:00
parent a657f18f1f
commit a36a4e2018
22 changed files with 100 additions and 195 deletions
--- a/patches/server/Add-ignore-discounts-API.patch
+++ b/patches/server/Add-ignore-discounts-API.patch
@@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                 MerchantOffer merchantrecipe = (MerchantOffer) iterator.next();
 +                if (merchantrecipe.ignoreDiscounts) continue; // Paper
 
-                 // CraftBukkit start
-                 int bonus = -Mth.floor((float) i * merchantrecipe.getPriceMultiplier());
+                 merchantrecipe.addToSpecialPriceDiff(-Mth.floor((float) i * merchantrecipe.getPriceMultiplier()));
+             }
@@ -0,0 +0,0 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
 
             while (iterator1.hasNext()) {