c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
112 Zeilen
3.4 KiB
Diff
112 Zeilen
3.4 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..0a3e3b56b754d8838674c88105bd1312b96eb69d
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
|
|
@@ -0,0 +1,99 @@
|
|
+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 handlers = 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 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 slot;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Clone of ItemStack that was in the slot before the change.
|
|
+ *
|
|
+ * @return The old ItemStack in the slot.
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getOldItemStack() {
|
|
+ return oldItemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Clone of ItemStack that is in the slot after the change.
|
|
+ *
|
|
+ * @return The new ItemStack in the slot.
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getNewItemStack() {
|
|
+ return newItemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets whether the slot change advancements will be triggered.
|
|
+ *
|
|
+ * @return Whether the slot change advancements will be triggered.
|
|
+ */
|
|
+ public boolean shouldTriggerAdvancements() {
|
|
+ return 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 handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|