Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-12 22:59:26 +01:00
Code Issues Projects Releases Wiki Activity

Handle null player for PlaceholderAPI

Browse Source 
Affects issues:
- Fixed #1493
This commit is contained in:
Risto Lahtela 2020-06-19 16:38:23 +03:00
parent e0946ebc9d
commit 47ef46eb97
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlanPlaceholderExtension.java
View File

@ -27,6 +27,7 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Collections; import java.util.Collections;
import java.util.UUID;
/** /**
* Placeholder expansion used to provide data from Plan on Bukkit. * Placeholder expansion used to provide data from Plan on Bukkit.
@ -82,8 +83,9 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
@Override @Override
public String onPlaceholderRequest(Player player, String params) { public String onPlaceholderRequest(Player player, String params) {
UUID uuid = player != null ? player.getUniqueId() : null;
try { try {
String value = placeholders.onPlaceholderRequest(player.getUniqueId(), params, Collections.emptyList()); String value = placeholders.onPlaceholderRequest(uuid, params, Collections.emptyList());
if ("true".equals(value)) { //hack if ("true".equals(value)) { //hack
value = PlaceholderAPIPlugin.booleanTrue(); value = PlaceholderAPIPlugin.booleanTrue();
@ -93,7 +95,7 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
return value; return value;
} catch (Exception e) { } catch (Exception e) {
errorLogger.log(L.WARN, e, ErrorContext.builder().whatToDo("Report this").related("Placeholder Request", params).build()); errorLogger.log(L.WARN, e, ErrorContext.builder().whatToDo("Report this").related("Placeholder Request", params, uuid).build());
return null; return null;
} }
} }