TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity

Disable prefixes for flag info headers and footers and suppress NPE in the update utility

Browse source
This commit is contained in:
Alexander Söderberg 2020-04-18 22:26:13 +02:00
parent cbea595fa0
commit bf5862942a
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View file

@ -673,19 +673,19 @@ public class PlayerEvents extends PlotListener implements Listener {
return; return;
} }
if (!UpdateUtility.internalVersion.equals(UpdateUtility.spigotVersion)) { try {
new PlotMessage("-----------------------------------").send(pp); if (!UpdateUtility.internalVersion.equals(UpdateUtility.spigotVersion)) {
new PlotMessage( new PlotMessage("-----------------------------------").send(pp);
Captions.PREFIX + "There appears to be a PlotSquared update available!") new PlotMessage(Captions.PREFIX + "There appears to be a PlotSquared update available!")
.color("$1").tooltip("https://www.spigotmc.org/resources/1177/updates") .color("$1").tooltip("https://www.spigotmc.org/resources/1177/updates").send(pp);
.send(pp); new PlotMessage(Captions.PREFIX + "The latest version is " + spigotVersion).color("$1").tooltip("https://www.spigotmc.org/resources/1177/updates")
new PlotMessage(Captions.PREFIX + "The latest version is " + spigotVersion) .send(pp);
.color("$1").tooltip("https://www.spigotmc.org/resources/1177/updates") new PlotMessage(Captions.PREFIX + "https://www.spigotmc.org/resources/1177/updates")
.send(pp); .color("$1").tooltip("https://www.spigotmc.org/resources/1177/updates").send(pp);
new PlotMessage(Captions.PREFIX + "https://www.spigotmc.org/resources/1177/updates") new PlotMessage("-----------------------------------").send(pp);
.color("$1").tooltip("https://www.spigotmc.org/resources/1177/updates") }
.send(pp); } catch (final Exception e) {
new PlotMessage("-----------------------------------").send(pp); e.printStackTrace();
} }
} }
} }

4
Core/src/main/java/com/plotsquared/core/configuration/Captions.java
View file

@ -568,8 +568,8 @@ public enum Captions implements Caption {
FLAG_PARSE_ERROR("$2Failed to parse flag '%flag_name%', value '%flag_value%': %error%", "Flag"), FLAG_PARSE_ERROR("$2Failed to parse flag '%flag_name%', value '%flag_value%': %error%", "Flag"),
//</editor-fold> //</editor-fold>
//<editor-fold desc="Flag"> //<editor-fold desc="Flag">
FLAG_INFO_HEADER("$3&m---------&r $1Plot² Flags $3&m---------", "Flag"), FLAG_INFO_HEADER("$3&m---------&r $1Plot² Flags $3&m---------", false, "Flag"),
FLAG_INFO_FOOTER("$3&m---------&r $1Plot² Flags $3&m---------", "Flag"), FLAG_INFO_FOOTER("$3&m---------&r $1Plot² Flags $3&m---------", false, "Flag"),
FLAG_INFO_COLOR_KEY("$1", "Flag"), FLAG_INFO_COLOR_KEY("$1", "Flag"),
FLAG_INFO_COLOR_VALUE("$2", "Flag"), FLAG_INFO_COLOR_VALUE("$2", "Flag"),
FLAG_INFO_NAME("Name: ", "Flag"), FLAG_INFO_NAME("Name: ", "Flag"),