Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
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 0775c1061a72af66344ec45248b50072c394da38..7e23e157eb70e6bf94d0ac4a0196cc5c943dcac4 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -154,6 +154,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.
|
|
*/
|