Repackage patches

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
--- a/paper-server/nms-patches/net/minecraft/world/item/trading/MerchantRecipe.patch
+++ b/paper-server/nms-patches/net/minecraft/world/item/trading/MerchantRecipe.patch
@@ -0,0 +1,37 @@
+--- a/net/minecraft/server/MerchantRecipe.java
+++ b/net/minecraft/server/MerchantRecipe.java
+@@ -1,5 +1,7 @@
+ package net.minecraft.server;
+ 
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; // CraftBukkit
+
+ public class MerchantRecipe {
+ 
+     public ItemStack buyingItem1;
+@@ -12,6 +14,18 @@
+     private int demand;
+     public float priceMultiplier;
+     public int xp;
+    // CraftBukkit start
+    private CraftMerchantRecipe bukkitHandle;
+
+    public CraftMerchantRecipe asBukkit() {
+        return (bukkitHandle == null) ? bukkitHandle = new CraftMerchantRecipe(this) : bukkitHandle;
+    }
+
+    public MerchantRecipe(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int uses, int maxUses, int experience, float priceMultiplier, CraftMerchantRecipe bukkit) {
+        this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier);
+        this.bukkitHandle = bukkit;
+    }
+    // CraftBukkit end
+ 
+     public MerchantRecipe(NBTTagCompound nbttagcompound) {
+         this.rewardExp = true;
+@@ -73,6 +87,7 @@
+ 
+     public ItemStack getBuyItem1() {
+         int i = this.buyingItem1.getCount();
+        if (i <= 0) return ItemStack.b; // CraftBukkit - SPIGOT-5476
+         ItemStack itemstack = this.buyingItem1.cloneItemStack();
+         int j = Math.max(0, MathHelper.d((float) (i * this.demand) * this.priceMultiplier));
+