mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
104 lines
2.8 KiB
Diff
104 lines
2.8 KiB
Diff
From b76fc97a0232e55bf7fbe24cbb97a14ae59b4abf 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
|
|
|