1 files changed, 166 insertions, 0 deletions
diff --git a/patches/api/0231-Added-PlayerTradeEvent.patch b/patches/api/0231-Added-PlayerTradeEvent.patch
new file mode 100644
index 0000000000..11ad019021
--- /dev/null
+++ b/patches/api/0231-Added-PlayerTradeEvent.patch
@@ -0,0 +1,166 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 2 Jul 2020 16:10:10 -0700
+Subject: [PATCH] Added PlayerTradeEvent
+
+[Amendment: Alexander <[email protected]>]
+PlayerTradeEvent is used for player purchases from villagers and wandering
+traders, but not custom merchants created via Bukkit.createMerchant(). During
+discussions in Discord it was decided that it'd be better to add a new event
+that PlayerTradeEvent inherits from than change getVillager()'s annotation to
+@Nullable, especially since that'd also infringe on the implication of the
+event being about villager trades.
+
+diff --git a/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..61c62877c38e27eacc20aa43ef02dc43e9b50bfc
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java
+@@ -0,0 +1,109 @@
++package io.papermc.paper.event.player;
++
++import com.google.common.base.Preconditions;
++import org.bukkit.entity.Player;
++import org.bukkit.event.Cancellable;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.player.PlayerEvent;
++import org.bukkit.inventory.MerchantRecipe;
++import org.jetbrains.annotations.ApiStatus;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when a player trades with a standalone merchant GUI.
++ */
++public class PlayerPurchaseEvent extends PlayerEvent implements Cancellable {
++
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
++    private boolean rewardExp;
++    private boolean increaseTradeUses;
++    private MerchantRecipe trade;
++
++    private boolean cancelled;
++
++    @ApiStatus.Internal
++    public PlayerPurchaseEvent(@NotNull Player player,
++                               @NotNull MerchantRecipe trade,
++                               boolean rewardExp,
++                               boolean increaseTradeUses) {
++        super(player);
++        setTrade(trade);
++        this.rewardExp = rewardExp;
++        this.increaseTradeUses = increaseTradeUses;
++    }
++
++    /**
++     * Gets the associated trade with this event
++     *
++     * @return the trade
++     */
++    @NotNull
++    public MerchantRecipe getTrade() {
++        return this.trade;
++    }
++
++    /**
++     * Sets the trade. This is then used to determine the next prices
++     *
++     * @param trade the trade to use
++     */
++    public void setTrade(@NotNull MerchantRecipe trade) {
++        Preconditions.checkArgument(trade != null, "Trade cannot be null!");
++        this.trade = trade;
++    }
++
++    /**
++     * @return will trade try to reward exp
++     */
++    public boolean isRewardingExp() {
++        return this.rewardExp;
++    }
++
++    /**
++     * Sets whether the trade will try to reward exp
++     *
++     * @param rewardExp try to reward exp
++     */
++    public void setRewardExp(boolean rewardExp) {
++        this.rewardExp = rewardExp;
++    }
++
++    /**
++     * @return whether the trade will count as a use of the trade
++     */
++    public boolean willIncreaseTradeUses() {
++        return this.increaseTradeUses;
++    }
++
++    /**
++     * Sets whether the trade will count as a use
++     *
++     * @param increaseTradeUses {@code true} to count, {@code false} otherwise
++     */
++    public void setIncreaseTradeUses(boolean increaseTradeUses) {
++        this.increaseTradeUses = increaseTradeUses;
++    }
++
++    @Override
++    public boolean isCancelled() {
++        return this.cancelled;
++    }
++
++    @Override
++    public void setCancelled(boolean cancel) {
++        this.cancelled = cancel;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return HANDLER_LIST;
++    }
++
++}
+diff --git a/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java
+new file mode 100755
+index 0000000000000000000000000000000000000000..559d1a3c783e6c726f48d1c88b2ff8c0888890ac
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java
+@@ -0,0 +1,32 @@
++package io.papermc.paper.event.player;
++
++import org.bukkit.entity.AbstractVillager;
++import org.bukkit.entity.Player;
++import org.bukkit.inventory.MerchantRecipe;
++import org.jetbrains.annotations.ApiStatus;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * Called when a player trades with a villager or wandering trader
++ */
++public class PlayerTradeEvent extends PlayerPurchaseEvent {
++
++    private final AbstractVillager villager;
++
++    @ApiStatus.Internal
++    public PlayerTradeEvent(@NotNull Player player, @NotNull AbstractVillager villager, @NotNull MerchantRecipe trade, boolean rewardExp, boolean increaseTradeUses) {
++        super(player, trade, rewardExp, increaseTradeUses);
++        this.villager = villager;
++    }
++
++    /**
++     * Gets the Villager or Wandering trader associated with this event
++     *
++     * @return the villager or wandering trader
++     */
++    @NotNull
++    public AbstractVillager getVillager() {
++        return this.villager;
++    }
++
++}