Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-25 12:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't enable integrations for disabled plugins

Browse Source
This commit is contained in:
Vankka 2024-10-20 23:12:23 +03:00
parent fa1b517d5e
commit b82840bb51
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/discordsrv/common/core/module/type/PluginIntegration.java
View File

@ -43,7 +43,11 @@ public abstract class PluginIntegration<DT extends DiscordSRV> extends AbstractM
@Override
@MustBeInvokedByOverriders
public boolean isEnabled() {
if (discordSRV.config().integrations.disabledIntegrations.contains(getIntegrationName())) {
String integrationName = getIntegrationName();
if (discordSRV.config().integrations.disabledIntegrations.contains(integrationName)) {
return false;
}
if (!discordSRV.pluginManager().isPluginEnabled(integrationName)) {
return false;
}
return super.isEnabled();

1
common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java
View File

@ -192,7 +192,6 @@ public class JDAConnectionManager implements DiscordConnectionManager {
@Subscribe
public void onDebugGenerate(DebugGenerateEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("Intents: ").append(intents);
builder.append("\nCache Flags: ").append(cacheFlags);