Finish converting all events to jspecify annotations
This commit is contained in:
parent
ea00be3aaa
commit
ba3c29b92e
82 changed files with 977 additions and 1103 deletions
|
@ -6,10 +6,10 @@ 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
|
||||
index 0000000000000000000000000000000000000000..f3a54ed7efabaa0f6413e1598f14e2770a46440d
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/event/player/PlayerInventorySlotChangeEvent.java
|
||||
@@ -0,0 +1,101 @@
|
||||
@@ -0,0 +1,98 @@
|
||||
+package io.papermc.paper.event.player;
|
||||
+
|
||||
+import org.bukkit.entity.Player;
|
||||
|
@ -17,11 +17,12 @@ index 0000000000000000000000000000000000000000..0be9708dbf84fa51a754474834406f9f
|
|||
+import org.bukkit.event.player.PlayerEvent;
|
||||
+import org.bukkit.inventory.Inventory;
|
||||
+import org.bukkit.inventory.ItemStack;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
+import org.jspecify.annotations.NullMarked;
|
||||
+
|
||||
+/**
|
||||
+ * Called when a slot contents change in a player's inventory.
|
||||
+ */
|
||||
+@NullMarked
|
||||
+public class PlayerInventorySlotChangeEvent extends PlayerEvent {
|
||||
+
|
||||
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
||||
|
@ -32,7 +33,7 @@ index 0000000000000000000000000000000000000000..0be9708dbf84fa51a754474834406f9f
|
|||
+ private final ItemStack newItemStack;
|
||||
+ private boolean triggerAdvancements = true;
|
||||
+
|
||||
+ public PlayerInventorySlotChangeEvent(@NotNull Player player, int rawSlot, @NotNull ItemStack oldItemStack, @NotNull ItemStack newItemStack) {
|
||||
+ public PlayerInventorySlotChangeEvent(final Player player, final int rawSlot, final ItemStack oldItemStack, final ItemStack newItemStack) {
|
||||
+ super(player);
|
||||
+ this.rawSlot = rawSlot;
|
||||
+ this.slot = player.getOpenInventory().convertSlot(rawSlot);
|
||||
|
@ -67,7 +68,6 @@ index 0000000000000000000000000000000000000000..0be9708dbf84fa51a754474834406f9f
|
|||
+ *
|
||||
+ * @return The old ItemStack in the slot.
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ public ItemStack getOldItemStack() {
|
||||
+ return this.oldItemStack;
|
||||
+ }
|
||||
|
@ -77,7 +77,6 @@ index 0000000000000000000000000000000000000000..0be9708dbf84fa51a754474834406f9f
|
|||
+ *
|
||||
+ * @return The new ItemStack in the slot.
|
||||
+ */
|
||||
+ @NotNull
|
||||
+ public ItemStack getNewItemStack() {
|
||||
+ return this.newItemStack;
|
||||
+ }
|
||||
|
@ -96,17 +95,15 @@ index 0000000000000000000000000000000000000000..0be9708dbf84fa51a754474834406f9f
|
|||
+ *
|
||||
+ * @param triggerAdvancements Whether the slot change advancements will be triggered.
|
||||
+ */
|
||||
+ public void setShouldTriggerAdvancements(boolean triggerAdvancements) {
|
||||
+ public void setShouldTriggerAdvancements(final boolean triggerAdvancements) {
|
||||
+ this.triggerAdvancements = triggerAdvancements;
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ @Override
|
||||
+ public HandlerList getHandlers() {
|
||||
+ return HANDLER_LIST;
|
||||
+ }
|
||||
+
|
||||
+ @NotNull
|
||||
+ public static HandlerList getHandlerList() {
|
||||
+ return HANDLER_LIST;
|
||||
+ }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue