diff --git a/VotingPlugin/Resources/Config.yml b/VotingPlugin/Resources/Config.yml index 5f4812a19..71cc66627 100644 --- a/VotingPlugin/Resources/Config.yml +++ b/VotingPlugin/Resources/Config.yml @@ -463,6 +463,9 @@ UseJavascriptPlaceholders: false # 'false': 'User does not have enough points' CustomPlaceholderReturns: {} +# Load votingplugin internal expansion +LoadInteralExpansion: true + ########################################### # Login options ########################################### diff --git a/VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java b/VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java index 59a1e9b9e..2b6fd0a79 100644 --- a/VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java +++ b/VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java @@ -1059,8 +1059,10 @@ public void onPostLoad() { } if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { - new VotingPluginExpansion(this).register(); - getLogger().info("Loading PlaceholderAPI expansion"); + if (getConfigFile().isLoadInteralExpansion()) { + new VotingPluginExpansion(this).register(); + getLogger().info("Loading PlaceholderAPI expansion"); + } } registerCommands(); @@ -1178,8 +1180,7 @@ public String onRewardRequested(Reward arg0, com.bencodez.advancedcore.api.user. ConfigurationSection section, HashMap placeholders) { if (section.getBoolean("Enabled")) { user.sendBossBar( - PlaceholderUtils.replacePlaceHolder(section.getString("Message", ""), - placeholders), + PlaceholderUtils.replacePlaceHolder(section.getString("Message", ""), placeholders), section.getString("Color", "BLUE"), section.getString("Style", "SOLID"), (double) getVotingPluginUserManager().getVotingPluginUser(user).getSitesVotedOn() / plugin.getVoteSites().size(), diff --git a/VotingPlugin/src/com/bencodez/votingplugin/config/Config.java b/VotingPlugin/src/com/bencodez/votingplugin/config/Config.java index 869464ecc..28f5fea4e 100644 --- a/VotingPlugin/src/com/bencodez/votingplugin/config/Config.java +++ b/VotingPlugin/src/com/bencodez/votingplugin/config/Config.java @@ -38,6 +38,10 @@ public class Config extends YMLFile { @ConfigDataBoolean(path = "AddTotalsOffline") @Getter private boolean addTotalsOffline = true; + + @ConfigDataBoolean(path = "LoadInteralExpansion") + @Getter + private boolean loadInteralExpansion = true; @ConfigDataBoolean(path = "PerSiteCoolDownEvents") @Getter