SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.17

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/net/minecraft/world/item/trading/MerchantRecipe.patch
View File

@@ -8,7 +8,7 @@
+
public class MerchantRecipe {
public ItemStack buyingItem1;
public ItemStack baseCostA;
@@ -17,6 +19,18 @@
private int demand;
public float priceMultiplier;
@@ -31,8 +31,8 @@
@@ -78,6 +92,7 @@
public ItemStack getBuyItem1() {
int i = this.buyingItem1.getCount();
+ if (i <= 0) return ItemStack.b; // CraftBukkit - SPIGOT-5476
ItemStack itemstack = this.buyingItem1.cloneItemStack();
int i = this.baseCostA.getCount();
+ if (i <= 0) return ItemStack.EMPTY; // CraftBukkit - SPIGOT-5476
ItemStack itemstack = this.baseCostA.cloneItemStack();
int j = Math.max(0, MathHelper.d((float) (i * this.demand) * this.priceMultiplier));