geforkt von Mirrors/Paper
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
117 Zeilen
3.5 KiB
Diff
117 Zeilen
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: SamB440 <sam@islandearth.net>
|
|
Date: Mon, 15 Nov 2021 18:09:46 +0000
|
|
Subject: [PATCH] Add PlayerItemFrameChangeEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java b/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..7bd61b66db42ecc8c9a3a16f563552414488079e
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java
|
|
@@ -0,0 +1,104 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.entity.ItemFrame;
|
|
+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.ItemStack;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when an {@link ItemFrame} is having an item rotated, added, or removed from it.
|
|
+ */
|
|
+public class PlayerItemFrameChangeEvent extends PlayerEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ private final ItemFrame itemFrame;
|
|
+ private final ItemFrameChangeAction action;
|
|
+ private ItemStack itemStack;
|
|
+
|
|
+ private boolean cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public PlayerItemFrameChangeEvent(@NotNull Player player, @NotNull ItemFrame itemFrame,
|
|
+ @NotNull ItemStack itemStack, @NotNull ItemFrameChangeAction action) {
|
|
+ super(player);
|
|
+ this.itemFrame = itemFrame;
|
|
+ this.itemStack = itemStack;
|
|
+ this.action = action;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link ItemFrame} involved in this event.
|
|
+ *
|
|
+ * @return the {@link ItemFrame}
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemFrame getItemFrame() {
|
|
+ return this.itemFrame;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link ItemStack} involved in this event.
|
|
+ * This is the item being added, rotated, or removed from the {@link ItemFrame}.
|
|
+ * <p>
|
|
+ * If this method returns air, then the resulting item in the ItemFrame will be empty.
|
|
+ *
|
|
+ * @return the {@link ItemStack} being added, rotated, or removed
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getItemStack() {
|
|
+ return this.itemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the {@link ItemStack} that this {@link ItemFrame} holds.
|
|
+ * If {@code null} is provided, the ItemStack will become air and the result in the ItemFrame will be empty.
|
|
+ *
|
|
+ * @param itemStack {@link ItemFrame} item
|
|
+ */
|
|
+ public void setItemStack(@Nullable ItemStack itemStack) {
|
|
+ this.itemStack = itemStack == null ? ItemStack.empty() : itemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the action that was performed on this {@link ItemFrame}.
|
|
+ *
|
|
+ * @return action performed on the item frame in this event
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemFrameChangeAction getAction() {
|
|
+ return this.action;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ public enum ItemFrameChangeAction {
|
|
+ PLACE,
|
|
+ REMOVE,
|
|
+ ROTATE
|
|
+ }
|
|
+}
|