Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-28 12:56:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3180

Browse Source
This commit is contained in:
NotMyFault 2021-07-26 21:23:59 +02:00
parent c9b012ea5b
commit 9a9365a04d
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/main/java/com/plotsquared/core/command/Merge.java
View File

@ -277,7 +277,8 @@ public class Merge extends SubCommand {
CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
.parse( .parse(
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player), TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
Template.of("player", player.getName()) Template.of("player", player.getName()),
Template.of("location", plot.getWorldName() + ";" + plot.getId())
)), )),
run run
); );

2
Core/src/main/resources/lang/messages_en.json
View File

@ -207,7 +207,7 @@
"permission.cant_claim_more_clusters": "<prefix><red>You can't claim more than <gold><amount> </gold>clusters.</red>", "permission.cant_claim_more_clusters": "<prefix><red>You can't claim more than <gold><amount> </gold>clusters.</red>",
"permission.cant_transfer_more_plots": "<prefix><red>You can't send more plots to that user.</red>", "permission.cant_transfer_more_plots": "<prefix><red>You can't send more plots to that user.</red>",
"permission.cant_claim_more_plots_num": "<prefix><red>You can't claim more than <gold><amount> </gold>plots at once.</red>", "permission.cant_claim_more_plots_num": "<prefix><red>You can't claim more than <gold><amount> </gold>plots at once.</red>",
"merge.merge_request_confirm": "<prefix><gray>Merge request from </gray><gold><player></gold><gray>.</gray>", "merge.merge_request_confirm": "<gray>Merge request from </gray><gold><player></gold> <gray>for plot</gray><gold> <location></gold>",
"merge.merge_not_valid": "<prefix><gray>This merge request is no longer valid.</gray>", "merge.merge_not_valid": "<prefix><gray>This merge request is no longer valid.</gray>",
"merge.merge_accepted": "<prefix><gray>The merge request has been accepted.</gray>", "merge.merge_accepted": "<prefix><gray>The merge request has been accepted.</gray>",
"merge.success_merge": "<prefix><dark_aqua>Plots have been merged!</dark_aqua>", "merge.success_merge": "<prefix><dark_aqua>Plots have been merged!</dark_aqua>",