From 9a9365a04db794117b03031682dba77128d2ec2c Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Mon, 26 Jul 2021 21:23:59 +0200
Subject: [PATCH] Fixes #3180

---
 Core/src/main/java/com/plotsquared/core/command/Merge.java | 3 ++-
 Core/src/main/resources/lang/messages_en.json              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java
index 834f2de9d..9121ec748 100644
--- a/Core/src/main/java/com/plotsquared/core/command/Merge.java
+++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java
@@ -277,7 +277,8 @@ public class Merge extends SubCommand {
                 CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
                                 .parse(
                                         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
                 );
diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json
index 475c82c8f..d23b11d70 100644
--- a/Core/src/main/resources/lang/messages_en.json
+++ b/Core/src/main/resources/lang/messages_en.json
@@ -207,7 +207,7 @@
   "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_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_accepted": "<prefix><gray>The merge request has been accepted.</gray>",
   "merge.success_merge": "<prefix><dark_aqua>Plots have been merged!</dark_aqua>",