Skip to content

Commit cc3d3d5

Browse files
committed
Handle null player in placeholder (Fix #701)
1 parent 8b9ee09 commit cc3d3d5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/placeholderapi/PlaceholderProcessor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ public String processPlaceholder(final Player player, final String identifier) {
7474
if (player == null)
7575
return "";
7676

77-
final CombatPlayer p = plugin.getPlayerManager().get(player);
77+
final CombatPlayer p = plugin.getPlayerManager().getUnchecked(player);
78+
if (p == null) {
79+
return null;
80+
}
7881
switch (identifier) {
7982
case "in_combat":
8083
return getPAPIBoolean(p.isInCombat());

0 commit comments

Comments
 (0)