aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0841-Fix-force-opening-enchantment-tables.patch
diff options
context:
space:
mode:
authormaxcom1 <[email protected]>2024-03-23 22:26:17 +0100
committerGitHub <[email protected]>2024-03-23 17:26:17 -0400
commitb6001403e9703cadaa6e8c8558e732b91c3c6d6e (patch)
treea8c57bbc334a8ad48d4ad2b43db335667b142bee /patches/server/0841-Fix-force-opening-enchantment-tables.patch
parent9ec7dfcbc41c6e625de0050b6997160a75df9f44 (diff)
downloadPaper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.tar.gz
Paper-b6001403e9703cadaa6e8c8558e732b91c3c6d6e.zip
Add methods to change entity physics (#10334)
Diffstat (limited to 'patches/server/0841-Fix-force-opening-enchantment-tables.patch')
-rw-r--r--patches/server/0841-Fix-force-opening-enchantment-tables.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/server/0841-Fix-force-opening-enchantment-tables.patch b/patches/server/0841-Fix-force-opening-enchantment-tables.patch
new file mode 100644
index 0000000000..70439d1f0f
--- /dev/null
+++ b/patches/server/0841-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 2abbcbd393660de69fec567c3e31dbc774d93920..10fad0ba0624fdb601de9cfb9dc82590bd8149ce 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;