0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
105 Zeilen
2.8 KiB
Diff
105 Zeilen
2.8 KiB
Diff
From 75757b48a916e1c8b4d1dd2d543baae0526525e2 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 11 Jun 2017 16:30:37 -0500
|
|
Subject: [PATCH] PlayerAttemptPickupItemEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
|
|
new file mode 100644
|
|
index 000000000..fb5cb3dc4
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
|
|
@@ -0,0 +1,89 @@
|
|
+package org.bukkit.event.player;
|
|
+
|
|
+import org.bukkit.entity.Item;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Thrown when a player attempts to pick an item up from the ground
|
|
+ */
|
|
+public class PlayerAttemptPickupItemEvent extends PlayerEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ @NotNull private final Item item;
|
|
+ private final int remaining;
|
|
+ private boolean flyAtPlayer = true;
|
|
+ private boolean isCancelled = false;
|
|
+
|
|
+ @Deprecated // Remove in 1.13 // Remove in 1.14?
|
|
+ public PlayerAttemptPickupItemEvent(@NotNull final Player player, @NotNull final Item item) {
|
|
+ this(player, item, 0);
|
|
+ }
|
|
+
|
|
+ public PlayerAttemptPickupItemEvent(@NotNull final Player player, @NotNull final Item item, final int remaining) {
|
|
+ super(player);
|
|
+ this.item = item;
|
|
+ this.remaining = remaining;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the Item attempted by the player.
|
|
+ *
|
|
+ * @return Item
|
|
+ */
|
|
+ @NotNull
|
|
+ public Item getItem() {
|
|
+ return item;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the amount that will remain on the ground, if any
|
|
+ *
|
|
+ * @return amount that will remain on the ground
|
|
+ */
|
|
+ public int getRemaining() {
|
|
+ return remaining;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set if the item will fly at the player
|
|
+ * <p>Cancelling the event will set this value to false.</p>
|
|
+ *
|
|
+ * @param flyAtPlayer True for item to fly at player
|
|
+ */
|
|
+ public void setFlyAtPlayer(boolean flyAtPlayer) {
|
|
+ this.flyAtPlayer = flyAtPlayer;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets if the item will fly at the player
|
|
+ *
|
|
+ * @return True if the item will fly at the player
|
|
+ */
|
|
+ public boolean getFlyAtPlayer() {
|
|
+ return this.flyAtPlayer;
|
|
+ }
|
|
+
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.isCancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.isCancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|