Rename placeholders matching more appropriately

This commit is contained in:
N0tMyFaultOG 2020-12-27 19:37:09 +01:00
parent bf20b0dd79
commit 7f01f2d716
No known key found for this signature in database
GPG Key ID: 823348042DA95A81

View File

@ -76,7 +76,7 @@ public final class PlaceholderRegistry {
this.registerPlaceholder(new PlotFlagPlaceholder(flag, true)); this.registerPlaceholder(new PlotFlagPlaceholder(flag, true));
this.registerPlaceholder(new PlotFlagPlaceholder(flag, false)); this.registerPlaceholder(new PlotFlagPlaceholder(flag, false));
}); });
this.createPlaceholder("currentplot_world", player -> player.getLocation().getWorldName()); this.createPlaceholder("world_name", player -> player.getLocation().getWorldName());
this.createPlaceholder("has_plot", player -> player.getPlotCount() > 0 ? "true" : "false"); this.createPlaceholder("has_plot", player -> player.getPlotCount() > 0 ? "true" : "false");
this.createPlaceholder("allowed_plot_count", (player) -> { this.createPlaceholder("allowed_plot_count", (player) -> {
if (player.getAllowedPlots() >= Integer.MAX_VALUE) { // Beautifies cases with '*' permission if (player.getAllowedPlots() >= Integer.MAX_VALUE) { // Beautifies cases with '*' permission
@ -101,7 +101,6 @@ public final class PlaceholderRegistry {
return PlayerManager.getName(plotOwner, false); return PlayerManager.getName(plotOwner, false);
} catch (final Exception ignored) { } catch (final Exception ignored) {
} }
return String.valueOf(TranslatableCaption.of("info.unknown")); return String.valueOf(TranslatableCaption.of("info.unknown"));
}); });
this.createPlaceholder("currentplot_members", (player, plot) -> { this.createPlaceholder("currentplot_members", (player, plot) -> {
@ -155,7 +154,7 @@ public final class PlaceholderRegistry {
sdf.setTimeZone(TimeZone.getTimeZone(Settings.Timeformat.TIME_ZONE)); sdf.setTimeZone(TimeZone.getTimeZone(Settings.Timeformat.TIME_ZONE));
return sdf.format(creationDate); return sdf.format(creationDate);
}); });
this.createPlaceholder("has_build_rights", (player, plot) -> this.createPlaceholder("currentplot_can_build", (player, plot) ->
plot.isAdded(player.getUUID()) ? "true" : "false"); plot.isAdded(player.getUUID()) ? "true" : "false");
this.createPlaceholder("currentplot_x", (player, plot) -> Integer.toString(plot.getId().getX())); this.createPlaceholder("currentplot_x", (player, plot) -> Integer.toString(plot.getId().getX()));
this.createPlaceholder("currentplot_y", (player, plot) -> Integer.toString(plot.getId().getY())); this.createPlaceholder("currentplot_y", (player, plot) -> Integer.toString(plot.getId().getY()));