Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-24 09:02:00 +01:00
Code Issues Projects Releases Wiki Activity

Remove null check for user in BasicPlaceholderExpansion

Browse Source 
https://github.com/BentoBoxWorld/BentoBox/issues/1654
This commit is contained in:
tastybento 2021-01-21 15:30:08 -08:00
parent 1eee225def
commit 01d8075318
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,9 +43,8 @@ abstract class BasicPlaceholderExpansion extends PlaceholderExpansion {
@Override @Override
public String onPlaceholderRequest(Player p, String placeholder) { public String onPlaceholderRequest(Player p, String placeholder) {
User user = User.getInstance(p); if (placeholders.containsKey(placeholder)) {
if (user != null && placeholders.containsKey(placeholder)) { return placeholders.get(placeholder).onReplace(User.getInstance(p));
return placeholders.get(placeholder).onReplace(user);
} }
return null; return null;
} }