EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01: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
commit cd06dbc915
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/ISSUE_TEMPLATE/bug-issue-report-for-plotsquared.md vendored
View File

@ -11,7 +11,7 @@ assignees: ''
<!--- ##### DO NOT REMOVE THIS TEMPLATE! YOUR ISSUE *WILL* FIT IN IT! ##### --> <!--- ##### DO NOT REMOVE THIS TEMPLATE! YOUR ISSUE *WILL* FIT IN IT! ##### -->
# NOTICE: <!--- # NOTICE:
```diff ```diff
! PlotSquared for Minecraft Java Edition versions between 1.7 through to 1.12.2 are considered ! PlotSquared for Minecraft Java Edition versions between 1.7 through to 1.12.2 are considered
! legacy, and will receive limited to no support. Please consider upgrading to 1.13+ for ! legacy, and will receive limited to no support. Please consider upgrading to 1.13+ for
@ -27,8 +27,9 @@ assignees: ''
**Code contributions are to be done through [PRs](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request), tagging the specific issue ticket(s) if applicable.** **Code contributions are to be done through [PRs](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request), tagging the specific issue ticket(s) if applicable.**
**[DISCORD INVITE LINK](https://discord.gg/cSMxtGn)** and please, for the love of the little sanity we have left, use the correct channels! **[DISCORD INVITE LINK](https://discord.gg/cSMxtGn)** and please, for the love of the little sanity we have left, use the correct channels!
-->
# BUG REPORT TEMPLATE: # Bug Report Template:
<!--- Incomplete reports will most likely be marked as invalid, and closed, with few exceptions.--> <!--- Incomplete reports will most likely be marked as invalid, and closed, with few exceptions.-->
## Required Information section: ## Required Information section:
> ALL FIELDS IN THIS SECTION ARE REQUIRED, and must contain appropriate information > ALL FIELDS IN THIS SECTION ARE REQUIRED, and must contain appropriate information
@ -55,7 +56,9 @@ assignees: ''
### Server build info: ### Server build info:
<!--- Run /version in-game or in console & paste the full output here: --> <!--- Run /version in-game or in console & paste the full output here: -->
``` paste here, between the tick marks, replacing this text ``` ```
paste here, between the tick marks, replacing this text
```
### WorldEdit/FAWE versions: ### WorldEdit/FAWE versions:
<!--- Specify which plugin you are using, and add its version --> <!--- Specify which plugin you are using, and add its version -->

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) { if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
try { try {
if (this.IMP.initWorldEdit()) { 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(); this.worldedit = WorldEdit.getInstance();
WorldEdit.getInstance().getEventBus().register(new WESubscriber()); WorldEdit.getInstance().getEventBus().register(new WESubscriber());
if (Settings.Enabled_Components.COMMANDS) { if (Settings.Enabled_Components.COMMANDS) {
@ -317,7 +317,7 @@ import java.util.zip.ZipInputStream;
e.printStackTrace(); 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("Show additional information in console") public static boolean DEBUG = false;
@Comment({"The big annoying text that appears when you enter a plot", @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; public static boolean TITLES = true;
@Create // This value will be generated automatically @Create // This value will be generated automatically
@ -331,7 +331,7 @@ public class Settings extends Config {
true; true;
@Comment("The UUID cacher is used to resolve player names") public static boolean @Comment("The UUID cacher is used to resolve player names") public static boolean
UUID_CACHE = true; 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("Stores user metadata in a database") public static boolean PERSISTENT_META = true;
@Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true; @Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true;
@Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true; @Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true;