mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 00:30:25 +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
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 161216be890690e9d2eaeee9eae695cd0be921ed Mon Sep 17 00:00:00 2001
|
|
From: Jedediah Smith <jedediah@silencegreys.com>
|
|
Date: Sun, 20 Mar 2016 06:44:49 -0400
|
|
Subject: [PATCH] Access items by EquipmentSlot
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
|
|
index 88ce9dc6b..96916ec95 100644
|
|
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
|
|
@@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory {
|
|
@Override
|
|
@Nullable
|
|
public HumanEntity getHolder();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the {@link ItemStack} found in the slot.
|
|
+ *
|
|
+ * @param slot The slot
|
|
+ * @return The item stack in the slot
|
|
+ */
|
|
+ @Nullable
|
|
+ ItemStack getItem(@NotNull EquipmentSlot slot);
|
|
+
|
|
+ /**
|
|
+ * Sets the {@link ItemStack} at the given {@link EquipmentSlot}.
|
|
+ *
|
|
+ * @param slot The slot for the stack
|
|
+ * @param stack The item stack to set
|
|
+ */
|
|
+ void setItem(@NotNull EquipmentSlot slot, @Nullable ItemStack stack);
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|