mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-23 17:36:33 +02:00
d1a72eac31
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: 1fc1020a PR-1049: Add MenuType API 8ae2e3be PR-1055: Expand riptiding API cac68bfb SPIGOT-7890: AttributeModifier#getUniqueId() doesn't match the UUID passed to its constructor 7004fcf2 SPIGOT-7886: Fix mistake in AttributeModifier UUID shim 1ac7f950 PR-1054: Add FireworkMeta#hasPower 4cfb565f SPIGOT-7873: Add powered state for skulls CraftBukkit Changes: bbb30e7a8 SPIGOT-7894: NPE when sending tile entity update ba21e9472 SPIGOT-7895: PlayerItemBreakEvent not firing 0fb24bbe0 SPIGOT-7875: Fix PlayerItemConsumeEvent cancellation causing client-side desync 815066449 SPIGOT-7891: Can't remove second ingredient of MerchantRecipe 45c206f2c PR-1458: Add MenuType API 19c8ef9ae SPIGOT-7867: Merchant instanceof AbstractVillager always returns false 4e006d28f PR-1468: Expand riptiding API bd8aded7d Ignore checks in CraftPlayerProfile for ResolvableProfile used in profile components 8679620b5 SPIGOT-7889: Fix tool component deserialisation without speed and/or correct-for-drops 8d5222691 SPIGOT-7882, PR-1467: Fix conversion of name in Profile Component to empty if it is missing 63f91669a SPIGOT-7887: Remove duplicate ProjectileHitEvent for fireballs 7070de8c8 SPIGOT-7878: Server#getLootTable does not return null on invalid loot table 060ee6cae SPIGOT-7876: Can't kick player or disconnect player in PlayerLoginEvent when checking for cookies 7ccb86cc0 PR-1465: Add FireworkMeta#hasPower 804ad6491 SPIGOT-7873: Add powered state for skulls f9610cdcb Improve minecart movement Spigot Changes: a759b629 Rebuild patches Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
83 lines
3.6 KiB
Diff
83 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 26 Aug 2020 02:12:31 -0400
|
|
Subject: [PATCH] Add additional open container api to HumanEntity
|
|
|
|
== AT ==
|
|
public net/minecraft/world/level/block/state/BlockBehaviour getMenuProvider(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
index c17dd4205983855615289cf0a5619056d237f325..6cda13df52ee4d56dd1d3c213307bfd38175584c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
|
@@ -471,6 +471,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
|
return this.getHandle().containerMenu.getBukkitView();
|
|
}
|
|
|
|
+ // Paper start - Add additional containers
|
|
+ @Override
|
|
+ public InventoryView openAnvil(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.ANVIL);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openCartographyTable(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.CARTOGRAPHY_TABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openGrindstone(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.GRINDSTONE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openLoom(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.LOOM);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openSmithingTable(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.SMITHING_TABLE);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public InventoryView openStonecutter(Location location, boolean force) {
|
|
+ return this.openInventory(location, force, Material.STONECUTTER);
|
|
+ }
|
|
+
|
|
+ private InventoryView openInventory(Location location, boolean force, Material material) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp("open" + material);
|
|
+ if (location == null) {
|
|
+ location = this.getLocation();
|
|
+ }
|
|
+ if (!force) {
|
|
+ Block block = location.getBlock();
|
|
+ if (block.getType() != material) {
|
|
+ return null;
|
|
+ }
|
|
+ }
|
|
+ net.minecraft.world.level.block.Block block;
|
|
+ if (material == Material.ANVIL) {
|
|
+ block = Blocks.ANVIL;
|
|
+ } else if (material == Material.CARTOGRAPHY_TABLE) {
|
|
+ block = Blocks.CARTOGRAPHY_TABLE;
|
|
+ } else if (material == Material.GRINDSTONE) {
|
|
+ block = Blocks.GRINDSTONE;
|
|
+ } else if (material == Material.LOOM) {
|
|
+ block = Blocks.LOOM;
|
|
+ } else if (material == Material.SMITHING_TABLE) {
|
|
+ block = Blocks.SMITHING_TABLE;
|
|
+ } else if (material == Material.STONECUTTER) {
|
|
+ block = Blocks.STONECUTTER;
|
|
+ } else {
|
|
+ throw new IllegalArgumentException("Unsupported inventory type: " + material);
|
|
+ }
|
|
+ this.getHandle().openMenu(block.getMenuProvider(null, this.getHandle().level(), new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ())));
|
|
+ this.getHandle().containerMenu.checkReachable = !force;
|
|
+ return this.getHandle().containerMenu.getBukkitView();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public void closeInventory() {
|
|
// Paper start - Inventory close reason
|