Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +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
29 Zeilen
1.0 KiB
Diff
29 Zeilen
1.0 KiB
Diff
From 21b8eb1d0a8a24b3b4611a98d2ec0f320ca3cbc7 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 5 Jun 2018 22:59:50 -0400
|
|
Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
|
|
|
Allows you to determine how long it takes to use a usable/consumable item
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index 9526cfe02..f129121e5 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -603,5 +603,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
|
public String getI18NDisplayName() {
|
|
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
|
|
}
|
|
+
|
|
+ public int getMaxItemUseDuration() {
|
|
+ if (type == null || type == Material.AIR || !type.isItem()) {
|
|
+ return 0;
|
|
+ }
|
|
+ // Requires access to NMS
|
|
+ return ensureServerConversions().getMaxItemUseDuration();
|
|
+ }
|
|
// Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|