1 files changed, 30 insertions, 0 deletions
diff --git a/patches/server/0957-Fix-force-opening-enchantment-tables.patch b/patches/server/0957-Fix-force-opening-enchantment-tables.patch
new file mode 100644
index 0000000000..8f0bd48367
--- /dev/null
+++ b/patches/server/0957-Fix-force-opening-enchantment-tables.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 26 Jan 2023 16:19:26 -0800
+Subject: [PATCH] Fix force-opening enchantment tables
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+index d69c05223fca71fc5e282095d02bc39fee7ec757..11a06cd0a9cee01107941a2294fbcb493a11ab63 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+@@ -396,7 +396,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+ 
+         // If there isn't an enchant table we can force create one, won't be very useful though.
+         BlockPos pos = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+-        this.getHandle().openMenu(((EnchantmentTableBlock) Blocks.ENCHANTING_TABLE).getMenuProvider(null, this.getHandle().level, pos));
++        // Paper start
++        MenuProvider menuProvider = ((EnchantmentTableBlock) Blocks.ENCHANTING_TABLE).getMenuProvider(null, this.getHandle().level, pos);
++        if (menuProvider == null) {
++            if (!force) {
++                return null;
++            }
++            menuProvider = new net.minecraft.world.SimpleMenuProvider((syncId, inventory, player) -> {
++                return new net.minecraft.world.inventory.EnchantmentMenu(syncId, inventory, net.minecraft.world.inventory.ContainerLevelAccess.create(this.getHandle().level, pos));
++            }, Component.translatable("container.enchant"));
++        }
++        this.getHandle().openMenu(menuProvider);
++        // Paper end
+ 
+         if (force) {
+             this.getHandle().containerMenu.checkReachable = false;