mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +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
35 lines
1008 B
Diff
35 lines
1008 B
Diff
From 9a6e1cc4daf83cbd118f9d47e5ab20ce4015018c Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 5 May 2017 03:57:08 -0500
|
|
Subject: [PATCH] Item#canEntityPickup
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
|
|
index 00c58c1d9..cb9e9f369 100644
|
|
--- a/src/main/java/org/bukkit/entity/Item.java
|
|
+++ b/src/main/java/org/bukkit/entity/Item.java
|
|
@@ -37,4 +37,20 @@ public interface Item extends Entity {
|
|
* @param delay New delay
|
|
*/
|
|
public void setPickupDelay(int delay);
|
|
+
|
|
+ // Paper Start
|
|
+ /**
|
|
+ * Gets if non-player entities can pick this Item up
|
|
+ *
|
|
+ * @return True if non-player entities can pickup
|
|
+ */
|
|
+ public boolean canMobPickup();
|
|
+
|
|
+ /**
|
|
+ * Sets if non-player entities can pick this Item up
|
|
+ *
|
|
+ * @param canMobPickup True to allow non-player entity pickup
|
|
+ */
|
|
+ public void setCanMobPickup(boolean canMobPickup);
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|