EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 10:14:42 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jesse Boyd
2019-11-22 16:12:01 +00:00
parent 977dfa807f 8b7e8ec635
commit cd06dbc915
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
View File

@ -245,7 +245,7 @@ import java.util.zip.ZipInputStream;
if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
try {
if (this.IMP.initWorldEdit()) {
PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
PlotSquared.log(Captions.PREFIX + "&6" + IMP.getPluginName() + " hooked into WorldEdit.");
this.worldedit = WorldEdit.getInstance();
WorldEdit.getInstance().getEventBus().register(new WESubscriber());
if (Settings.Enabled_Components.COMMANDS) {
@ -317,7 +317,7 @@ import java.util.zip.ZipInputStream;
e.printStackTrace();
}
PlotSquared.log(Captions.ENABLED.f(IMP.getPluginName()));
PlotSquared.log(Captions.PREFIX + Captions.ENABLED.f(IMP.getPluginName()));
}
/**

4
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
View File

@ -28,7 +28,7 @@ public class Settings extends Config {
@Comment("Show additional information in console") public static boolean DEBUG = false;
@Comment({"The big annoying text that appears when you enter a plot",
"For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"})
"For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`", "For all plots: Add `titles: false` in the worlds.yml flags block"})
public static boolean TITLES = true;
@Create // This value will be generated automatically
@ -331,7 +331,7 @@ public class Settings extends Config {
true;
@Comment("The UUID cacher is used to resolve player names") public static boolean
UUID_CACHE = true;
@Comment("The plugin auto updater") public static boolean UPDATER = true;
@Comment("The plugin auto updater will notify you if updates are available.") public static boolean UPDATER = true;
@Comment("Stores user metadata in a database") public static boolean PERSISTENT_META = true;
@Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true;
@Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true;