mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
109 lines
3.5 KiB
Diff
109 lines
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..451fb94a5802755c255e04aebb40f178bbfbf996
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/player/PlayerItemFrameChangeEvent.java
|
|
@@ -0,0 +1,97 @@
|
|
+package io.papermc.paper.event.player;
|
|
+
|
|
+import org.bukkit.Material;
|
|
+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.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 HANDLERS = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final ItemFrame itemFrame;
|
|
+ private ItemStack itemStack;
|
|
+ private final ItemFrameChangeAction action;
|
|
+
|
|
+ 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 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.</p>
|
|
+ * @return the {@link ItemStack} being added, rotated, or removed
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getItemStack() {
|
|
+ return itemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets the {@link ItemStack} that this {@link ItemFrame} holds.
|
|
+ * If 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 ? new ItemStack(Material.AIR) : itemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the action that was performed on this {@link ItemFrame}.
|
|
+ * @see ItemFrameChangeAction
|
|
+ * @return action performed on the item frame in this event
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemFrameChangeAction getAction() {
|
|
+ return action;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLERS;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLERS;
|
|
+ }
|
|
+
|
|
+ public enum ItemFrameChangeAction {
|
|
+ PLACE,
|
|
+ REMOVE,
|
|
+ ROTATE
|
|
+ }
|
|
+}
|