SpigotMC-Mirrors/PlaceholderAPI
1
0
Fork 0
mirror of https://github.com/PlaceholderAPI/PlaceholderAPI synced 2026-01-17 05:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Max Berkelmans
2019-10-16 22:28:19 +02:00
committed by GitHub
parent 719172c185 38c1eca590
commit 5c6202a8ee
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/clip/placeholderapi/PlaceholderAPI.java
View File

@@ -345,12 +345,13 @@ public class PlaceholderAPI {
}
public static boolean registerExpansion(PlaceholderExpansion ex) {
if (registerPlaceholderHook(ex.getIdentifier(), ex)) {
Bukkit.getPluginManager().callEvent(new ExpansionRegisterEvent(ex));
return true;
ExpansionRegisterEvent ev = new ExpansionRegisterEvent(ex);
Bukkit.getPluginManager().callEvent(ev);
if (ev.isCancelled()) {
return false;
}
return false;
return registerPlaceholderHook(ex.getIdentifier(), ex);
}
public static boolean unregisterExpansion(PlaceholderExpansion ex) {