aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0912-Fix-force-opening-enchantment-tables.patch
diff options
context:
space:
mode:
authorTamion <[email protected]>2023-11-04 21:20:13 +0100
committerGitHub <[email protected]>2023-11-04 13:20:13 -0700
commitbffb08c2f99a5527b7357d005cb10ba21cf048d9 (patch)
treec25ad5490b0ede8ce30bc0f23b5e0255eecc0dbc /patches/server/0912-Fix-force-opening-enchantment-tables.patch
parent6592fed511ee2ea17de9e05463579bd1923cf8aa (diff)
downloadPaper-bffb08c2f99a5527b7357d005cb10ba21cf048d9.tar.gz
Paper-bffb08c2f99a5527b7357d005cb10ba21cf048d9.zip
Deprecate Player#boostElytra (#9899)
The Paper method was chosen for deprecation because it was more restrictive in that it has an isGliding check.
Diffstat (limited to 'patches/server/0912-Fix-force-opening-enchantment-tables.patch')
-rw-r--r--patches/server/0912-Fix-force-opening-enchantment-tables.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/server/0912-Fix-force-opening-enchantment-tables.patch b/patches/server/0912-Fix-force-opening-enchantment-tables.patch
new file mode 100644
index 0000000000..7bdc01b518
--- /dev/null
+++ b/patches/server/0912-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 9531094aa2b551e5576b0af494cc141fd8cac007..e6326a7cefee568d7639cd3d0166910f8b965b80 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+@@ -402,7 +402,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 = CraftLocation.toBlockPosition(location);
+- 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;