Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 19:10:09 +01:00
bd38e0318a
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear 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: f02baa38 PR-988: Add World#getIntersectingChunks(BoundingBox) 9321d665 Move getItemInUse up to LivingEntity 819eef73 PR-959: Add access to current item's remaining ticks c4fdadb0 SPIGOT-7601: Add AbstractArrow#getItem be8261ca Add support for Java 22 26119676 PR-979: Add more translation keys 66753362 PR-985: Correct book maximum pages and characters per page documentation c8be92fa PR-980: Improve getArmorContents() documentation f1120ee2 PR-983: Expose riptide velocity to PlayerRiptideEvent CraftBukkit Changes: dfaa89bbe PR-1369: Add World#getIntersectingChunks(BoundingBox) 51bbab2b9 Move getItemInUse up to LivingEntity 668e09602 PR-1331: Add access to current item's remaining ticks a639406d1 SPIGOT-7601: Add AbstractArrow#getItem 0398930fc SPIGOT-7602: Allow opening in-world horse and related inventories ffd15611c SPIGOT-7608: Allow empty lists to morph to any PDT list 2188dcfa9 Add support for Java 22 45d6a609f SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime" 06d915943 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime ca3bc3707 PR-1361: Add more translation keys 366c3ca80 SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs 06d0f9ba8 SPIGOT-7593: Fix sapling growth physics / client-side updates 45c2608e4 PR-1366: Expose riptide velocity to PlayerRiptideEvent 29b6bb79b SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
104 Zeilen
4.3 KiB
Diff
104 Zeilen
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 26 Aug 2020 02:11:58 -0400
|
|
Subject: [PATCH] Add additional open container api to HumanEntity
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 2557ddcc0528d4f9d811883b3ddc61148ebc3998..5ecfb98540c00da05b13bc5370debb89c52cc76f 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -174,6 +174,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
@Nullable
|
|
public InventoryView openMerchant(@NotNull Merchant merchant, boolean force);
|
|
|
|
+ // Paper start - Add additional containers
|
|
+ /**
|
|
+ * Opens an empty anvil inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no anvil block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openAnvil(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty cartography table inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no cartography table block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openCartographyTable(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty grindstone inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no grindstone block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openGrindstone(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty loom inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no loom block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openLoom(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty smithing table inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no smithing table block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openSmithingTable(@Nullable Location location, boolean force);
|
|
+
|
|
+ /**
|
|
+ * Opens an empty stonecutter inventory window with the player's inventory
|
|
+ * on the bottom.
|
|
+ *
|
|
+ * @param location The location to attach it to. If null, the player's
|
|
+ * location is used.
|
|
+ * @param force If false, and there is no stonecutter block at the location,
|
|
+ * no inventory will be opened and null will be returned.
|
|
+ * @return The newly opened inventory view, or null if it could not be
|
|
+ * opened.
|
|
+ */
|
|
+ @Nullable
|
|
+ public InventoryView openStonecutter(@Nullable Location location, boolean force);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Force-closes the currently open inventory view for this player, if any.
|
|
*/
|