Merge branch 'master' into master

This commit is contained in:
Max Berkelmans
2019-10-16 22:28:19 +02:00
committed by GitHub
6 changed files with 24 additions and 9 deletions

View File

@@ -98,7 +98,7 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
*/
public boolean isRegistered() {
Validate.notNull(getIdentifier(), "Placeholder identifier can not be null!");
return PlaceholderAPI.getRegisteredIdentifiers().contains(getIdentifier());
return PlaceholderAPI.isRegistered(getIdentifier());
}
/**