Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1868

This commit is contained in:
tastybento 2021-10-30 13:44:34 -07:00
parent 8752e19e5d
commit 1953caa7c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/world/bentobox/bentobox/api/placeholders/placeholderapi/BasicPlaceholderExpansion.java
View File

@ -43,12 +43,12 @@ abstract class BasicPlaceholderExpansion extends PlaceholderExpansion {
@Override
public String onPlaceholderRequest(Player p, @NonNull String placeholder) {
if (placeholders.containsKey(placeholder)) {
if (placeholders.containsKey(placeholder) && p != null) {
return placeholders.get(placeholder).onReplace(User.getInstance(p));
}
return null;
}
/**
* Checks if a placeholder with this name is already registered
* @param placeholder - name of placeholder
@ -56,7 +56,7 @@ abstract class BasicPlaceholderExpansion extends PlaceholderExpansion {
* @since 1.4.0
*/
public boolean isPlaceholder(@NonNull String placeholder) {
return placeholders.containsKey(placeholder);
return placeholders.containsKey(placeholder);
}
@Override