mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
113 lines
3.5 KiB
Diff
113 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jakub Zacek <dawon@dawon.eu>
|
|
Date: Sun, 24 Apr 2022 22:56:31 +0200
|
|
Subject: [PATCH] Add PlayerInventorySlotChangeEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..0be9708dbf84fa51a754474834406f9fa7457dbe
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
|
|
@@ -0,0 +1,101 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.inventory.Inventory;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a slot contents change in a player's inventory.
|
|
+ */
|
|
+public class PlayerInventorySlotChangeEvent extends PlayerEvent {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final int rawSlot;
|
|
+ private final int slot;
|
|
+ private final ItemStack oldItemStack;
|
|
+ private final ItemStack newItemStack;
|
|
+ private boolean triggerAdvancements = true;
|
|
+
|
|
+ public PlayerInventorySlotChangeEvent(@NotNull Player player, int rawSlot, @NotNull ItemStack oldItemStack, @NotNull ItemStack newItemStack) {
|
|
+ super(player);
|
|
+ this.rawSlot = rawSlot;
|
|
+ this.slot = player.getOpenInventory().convertSlot(rawSlot);
|
|
+ this.oldItemStack = oldItemStack;
|
|
+ this.newItemStack = newItemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The raw slot number that was changed.
|
|
+ *
|
|
+ * @return The raw slot number.
|
|
+ */
|
|
+ public int getRawSlot() {
|
|
+ return this.rawSlot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The slot number that was changed, ready for passing to
|
|
+ * {@link Inventory#getItem(int)}. Note that there may be two slots with
|
|
+ * the same slot number, since a view links two different inventories.
|
|
+ * <p>
|
|
+ * If no inventory is opened, internal crafting view is used for conversion.
|
|
+ *
|
|
+ * @return The slot number.
|
|
+ */
|
|
+ public int getSlot() {
|
|
+ return this.slot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Clone of ItemStack that was in the slot before the change.
|
|
+ *
|
|
+ * @return The old ItemStack in the slot.
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getOldItemStack() {
|
|
+ return this.oldItemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Clone of ItemStack that is in the slot after the change.
|
|
+ *
|
|
+ * @return The new ItemStack in the slot.
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getNewItemStack() {
|
|
+ return this.newItemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets whether the slot change advancements will be triggered.
|
|
+ *
|
|
+ * @return Whether the slot change advancements will be triggered.
|
|
+ */
|
|
+ public boolean shouldTriggerAdvancements() {
|
|
+ return this.triggerAdvancements;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets whether the slot change advancements will be triggered.
|
|
+ *
|
|
+ * @param triggerAdvancements Whether the slot change advancements will be triggered.
|
|
+ */
|
|
+ public void setShouldTriggerAdvancements(boolean triggerAdvancements) {
|
|
+ this.triggerAdvancements = triggerAdvancements;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|