mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-22 04:44:51 +02:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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;
|