Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-28 12:56:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v5' into v6

Browse Source
This commit is contained in:
NotMyFault 2021-06-20 18:22:21 +02:00
commit 8eb8c24209
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/plotsquared/core/command/MainCommand.java
View File

@ -162,6 +162,10 @@ public class MainCommand extends Command {
// Referenced commands // Referenced commands
instance.toggle = injector.getInstance(Toggle.class); instance.toggle = injector.getInstance(Toggle.class);
instance.help = new Help(instance); instance.help = new Help(instance);
if (!Settings.Enabled_Components.DISABLE_NASHORN_SCRIPT_ENGINE) {
new DebugExec();
}
} }
return instance; return instance;
} }

1
Core/src/main/java/com/plotsquared/core/configuration/Settings.java
View File

@ -780,7 +780,6 @@ public class Settings extends Config {
); );
@Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not") @Comment("Whether PlotSquared should hook into MvDWPlaceholderAPI or not")
public static boolean USE_MVDWAPI = true; public static boolean USE_MVDWAPI = true;
} }
} }