From dd4461eb192e3ec169ab07e900b2a409c317fe05 Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Wed, 9 Jul 2025 05:30:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20CustomFishing=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compatibility/item/CustomFishingProvider.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/CustomFishingProvider.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/CustomFishingProvider.java index e32e03631..ead100754 100644 --- a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/CustomFishingProvider.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/item/CustomFishingProvider.java @@ -4,20 +4,28 @@ import net.momirealms.craftengine.core.item.ExternalItemProvider; import net.momirealms.craftengine.core.item.ItemBuildContext; import net.momirealms.customfishing.api.BukkitCustomFishingPlugin; import net.momirealms.customfishing.api.mechanic.context.Context; +import net.momirealms.customfishing.api.mechanic.context.ContextKeys; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.util.Optional; + public class CustomFishingProvider implements ExternalItemProvider { @Override public String plugin() { return "CustomFishing"; } + @SuppressWarnings("UnstableApiUsage") @Nullable @Override public ItemStack build(String id, ItemBuildContext context) { - return BukkitCustomFishingPlugin.getInstance().getItemManager() - .buildInternal(Context.player(((Player) context.player().platformPlayer())), id); + Context ctx = Context.player( + (Player) Optional.ofNullable(context.player()) + .map(net.momirealms.craftengine.core.entity.player.Player::platformPlayer) + .orElse(null) + ); + return BukkitCustomFishingPlugin.getInstance().getItemManager().buildInternal(ctx.arg(ContextKeys.ID, id), id); } }