Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-20 23:49:27 +00:00
Code Issues Releases Activity

Merge pull request #427 from Catnies/fix-papi

Browse Source 
修复当 PlayerOptionalContext 里不包含 Player参数时, 无法解析 <papi> tag;
This commit is contained in:
XiaoMoMi
2025-10-26 16:17:53 +08:00
committed by GitHub
parent 2c6c902fae f91ebafda9
commit 880b200553
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/BukkitCompatibilityManager.java
View File

@@ -339,7 +339,9 @@ public class BukkitCompatibilityManager implements CompatibilityManager {
@Override @Override
public String parse(Player player, String text) { public String parse(Player player, String text) {
return PlaceholderAPIUtils.parse((org.bukkit.entity.Player) player.platformPlayer(), text); return player == null
? PlaceholderAPIUtils.parse(null, text)
: PlaceholderAPIUtils.parse((org.bukkit.entity.Player) player.platformPlayer(), text);
} }
@Override @Override

4
core/src/main/java/net/momirealms/craftengine/core/plugin/text/minimessage/PlaceholderTag.java
View File

@@ -26,7 +26,9 @@ public class PlaceholderTag implements TagResolver {
String rawArgument = arguments.popOr("No argument relational placeholder provided").toString(); String rawArgument = arguments.popOr("No argument relational placeholder provided").toString();
if (rawArgument.contains("<")) rawArgument = AdventureHelper.resolvePlainStringTags(rawArgument, this.context.tagResolvers()); if (rawArgument.contains("<")) rawArgument = AdventureHelper.resolvePlainStringTags(rawArgument, this.context.tagResolvers());
String placeholder = "%" + rawArgument + "%"; String placeholder = "%" + rawArgument + "%";
String parsed = this.context instanceof PlayerContext playerContext ? CraftEngine.instance().compatibilityManager().parse(playerContext.player(), placeholder) : CraftEngine.instance().compatibilityManager().parse(null, placeholder); String parsed = (this.context instanceof PlayerContext playerContext)
? CraftEngine.instance().compatibilityManager().parse(playerContext.player(), placeholder)
: CraftEngine.instance().compatibilityManager().parse(null, placeholder);
if (parsed.equals(placeholder)) { if (parsed.equals(placeholder)) {
parsed = arguments.popOr("No default papi value provided").toString(); parsed = arguments.popOr("No default papi value provided").toString();
} }