mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 18:45:54 +01:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
167 lines
5.4 KiB
Diff
167 lines
5.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 2 Jul 2020 16:10:10 -0700
|
|
Subject: [PATCH] Added PlayerTradeEvent
|
|
|
|
[Amendment: Alexander <protonull@protonmail.com>]
|
|
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..c5648055c5e815474bf1e564a5c192ff5c0624fb
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerPurchaseEvent.java
|
|
@@ -0,0 +1,112 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import java.util.Objects;
|
|
+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.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a player trades with a standalone merchant GUI.
|
|
+ */
|
|
+public class PlayerPurchaseEvent extends PlayerEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+
|
|
+ private boolean increaseTradeUses;
|
|
+ private boolean rewardExp;
|
|
+ private MerchantRecipe trade;
|
|
+
|
|
+ public PlayerPurchaseEvent(@NotNull Player player,
|
|
+ @NotNull MerchantRecipe trade,
|
|
+ boolean rewardExp,
|
|
+ boolean increaseTradeUses) {
|
|
+ super(Objects.requireNonNull(player, "Player cannot be null!"));
|
|
+ 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) {
|
|
+ this.trade = Objects.requireNonNull(trade, "Trade cannot be null!");
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @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 or not the trade will count as a use of the trade
|
|
+ */
|
|
+ public boolean willIncreaseTradeUses() {
|
|
+ return this.increaseTradeUses;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets whether or not the trade will count as a use
|
|
+ * @param increaseTradeUses true to count/false to not count
|
|
+ */
|
|
+ public void setIncreaseTradeUses(boolean increaseTradeUses) {
|
|
+ this.increaseTradeUses = increaseTradeUses;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins
|
|
+ *
|
|
+ * @return true if this event is cancelled
|
|
+ */
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the cancellation state of this event. A cancelled event will not
|
|
+ * be executed in the server, but will still pass to other plugins.
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+}
|
|
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..a41fc186746b87f76347dfcc1f80d0969398322b
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerTradeEvent.java
|
|
@@ -0,0 +1,29 @@
|
|
+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.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a player trades with a villager or wandering trader
|
|
+ */
|
|
+public class PlayerTradeEvent extends PlayerPurchaseEvent {
|
|
+
|
|
+ private final AbstractVillager villager;
|
|
+
|
|
+ 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;
|
|
+ }
|
|
+
|
|
+}
|