EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-31 01:23:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v5' of https://github.com/IntellectualSites/PlotSquared into v5

Browse Source
This commit is contained in:
dordsor21
2020-04-28 11:21:51 +01:00
parent a130d801d5 51b6f41eff
commit 8a21334e66
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@@ -204,9 +204,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
if (Settings.Enabled_Components.EXTERNAL_PLACEHOLDERS) { if (Settings.Enabled_Components.EXTERNAL_PLACEHOLDERS) {
ChatFormatter.formatters.add(new PlaceholderFormatter()); ChatFormatter.formatters.add(new PlaceholderFormatter());
} }
PlotSquared.log(Captions.PREFIX + "&6PlaceholderAPI found! Hook activated."); PlotSquared.log(Captions.PREFIX + "&6PlotSquared hooked into PlaceholderAPI");
} else { } else {
PlotSquared.log(Captions.PREFIX + "&6PlaceholderAPI is not in use. Hook deactivated."); PlotSquared.debug(Captions.PREFIX + "&6PlaceholderAPI is not in use. Hook deactivated.");
} }
this.startMetrics(); this.startMetrics();

2
Core/src/main/java/com/plotsquared/core/command/DebugExec.java
View File

@@ -128,7 +128,7 @@ public class DebugExec extends SubCommand {
//create nashorn engine //create nashorn engine
this.engine = scriptEngineManager.getEngineByName("nashorn"); this.engine = scriptEngineManager.getEngineByName("nashorn");
try { try {
engine.eval("print('PlotSquared Scripting Test');"); engine.eval("print('PlotSquared scripting engine started');");
} catch (ScriptException e) { } catch (ScriptException e) {
e.printStackTrace(); e.printStackTrace();
} }