PlayerSwapWithEquipmentSlotEvent

Author: Lulu13022002

paper-api/src/main/java/io/papermc/paper/event/player/PlayerSwapWithEquipmentSlotEvent.java

@@ -6,70 +6,31 @@
 import org.bukkit.event.player.PlayerEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.ApiStatus;
-import org.jspecify.annotations.NullMarked;
 
 /**
  * Triggered when a {@link Player} swaps an item with an equipment slot.
  */
-@NullMarked
-public class PlayerSwapWithEquipmentSlotEvent extends PlayerEvent implements Cancellable {
-    private static final HandlerList HANDLERS = new HandlerList();
-    private final ItemStack itemInHand;
-    private final EquipmentSlot slot;
-    private final ItemStack itemToSwap;
-    private boolean cancelled;
-
-    @ApiStatus.Internal
-    public PlayerSwapWithEquipmentSlotEvent(
-        final Player player,
-        final ItemStack itemInHand,
-        final EquipmentSlot slot,
-        final ItemStack itemToSwap
-    ) {
-        super(player);
-        this.itemInHand = itemInHand;
-        this.slot = slot;
-        this.itemToSwap = itemToSwap;
-    }
+public interface PlayerSwapWithEquipmentSlotEvent extends PlayerEvent, Cancellable {
 
     /**
      * {@return the item in one of the hand slots}
      */
-    public ItemStack getItemInHand() {
-        return this.itemInHand.clone();
-    }
+    ItemStack getItemInHand();
 
     /**
      * {@return the slot to swap into}
      */
-    public EquipmentSlot getSlot() {
-        return this.slot;
-    }
+    EquipmentSlot getSlot();
 
     /**
      * {@return the item to swap}
      */
-    public ItemStack getItemToSwap() {
-        return this.itemToSwap.clone();
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLERS;
-    }
+    ItemStack getItemToSwap();
 
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
+    static HandlerList getHandlerList() {
+        final class Holder {
+            private static final HandlerList HANDLER_LIST = new HandlerList();
+        }
+        return Holder.HANDLER_LIST;
     }
 }

paper-server/patches/features/0035-Events-to-interfaces.patch

@@ -1814,6 +1814,30 @@ index 8e9db734d19b2082437eaa424f33df2b3321c2cf..1ece773f4943760af95f609b8a99f8bb
                  if (!shieldDisableEvent.callEvent()) return;
                  player.getCooldowns().addCooldown(stack, shieldDisableEvent.getCooldown());
                  // Paper end
+diff --git a/net/minecraft/world/item/equipment/Equippable.java b/net/minecraft/world/item/equipment/Equippable.java
+index fe24aff29f04027449abd68b9d0630c2b106877f..5617091793e8d68f5e388e27d37c33b33819f86c 100644
+--- a/net/minecraft/world/item/equipment/Equippable.java
++++ b/net/minecraft/world/item/equipment/Equippable.java
+@@ -130,7 +130,7 @@ public record Equippable(
+             if ((!EnchantmentHelper.has(itemBySlot, EnchantmentEffectComponents.PREVENT_ARMOR_CHANGE) || player.isCreative())
+                 && !ItemStack.isSameItemSameComponents(stack, itemBySlot)) {
+                 // Paper start
+-                final io.papermc.paper.event.player.PlayerSwapWithEquipmentSlotEvent event = new io.papermc.paper.event.player.PlayerSwapWithEquipmentSlotEvent(
++                final io.papermc.paper.event.player.PlayerSwapWithEquipmentSlotEvent event = new io.papermc.paper.event.player.PaperPlayerSwapWithEquipmentSlotEvent(
+                     (org.bukkit.entity.Player) player.getBukkitEntity(),
+                     org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(stack),
+                     org.bukkit.craftbukkit.CraftEquipmentSlot.getSlot(this.slot),
+@@ -138,7 +138,9 @@ public record Equippable(
+                 );
+                 event.callEvent();
+                 if (event.isCancelled()) {
+-                    ((org.bukkit.entity.Player) player.getBukkitEntity()).updateInventory();
++                    player.containerMenu.forceHeldSlot(net.minecraft.world.InteractionHand.MAIN_HAND);
++                    player.containerMenu.forceHeldSlot(net.minecraft.world.InteractionHand.OFF_HAND);
++                    player.containerMenu.forceSlot(player.getInventory(), this.slot.getIndex(net.minecraft.world.entity.player.Inventory.INVENTORY_SIZE));
+                     return InteractionResult.FAIL;
+                 }
+                 // Paper end
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
 index 579bbba4e823d4d0318e58759ca732b7c8e4d865..38325b7f799f4636f01efcfd248b1736cf86484f 100644
 --- a/net/minecraft/world/level/Level.java

paper-server/src/main/java/io/papermc/paper/event/player/PaperPlayerSwapWithEquipmentSlotEvent.java

@@ -0,0 +1,60 @@
+package io.papermc.paper.event.player;
+
+import org.bukkit.craftbukkit.event.player.CraftPlayerEvent;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
+
+public class PaperPlayerSwapWithEquipmentSlotEvent extends CraftPlayerEvent implements PlayerSwapWithEquipmentSlotEvent {
+
+    private final ItemStack itemInHand;
+    private final EquipmentSlot slot;
+    private final ItemStack itemToSwap;
+
+    private boolean cancelled;
+
+    @ApiStatus.Internal
+    public PaperPlayerSwapWithEquipmentSlotEvent(
+        final Player player,
+        final ItemStack itemInHand,
+        final EquipmentSlot slot,
+        final ItemStack itemToSwap
+    ) {
+        super(player);
+        this.itemInHand = itemInHand;
+        this.slot = slot;
+        this.itemToSwap = itemToSwap;
+    }
+
+    @Override
+    public ItemStack getItemInHand() {
+        return this.itemInHand.clone();
+    }
+
+    @Override
+    public EquipmentSlot getSlot() {
+        return this.slot;
+    }
+
+    @Override
+    public ItemStack getItemToSwap() {
+        return this.itemToSwap.clone();
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean cancel) {
+        this.cancelled = cancel;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return PlayerSwapWithEquipmentSlotEvent.getHandlerList();
+    }
+}

paper-server/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/bytecode/ClassToInterfaceRules.java

@@ -94,6 +94,7 @@ private static Set<Class<?>> classes() {
             PlayerPickBlockEvent.class,
             PlayerPickEntityEvent.class,
             PlayerStopUsingItemEvent.class,
+            PlayerSwapWithEquipmentSlotEvent.class,
             PlayerTrackEntityEvent.class,
             PlayerUntrackEntityEvent.class,
             PrePlayerAttackEntityEvent.class,