From ab8ece4b6d367a8138774035823020854961a84e Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Sat, 21 Mar 2015 00:43:21 +1100
Subject: [PATCH] *yet another fix

---
 .../java/com/intellectualcrafters/plot/commands/Merge.java | 7 +++----
 .../main/java/com/intellectualcrafters/plot/config/C.java  | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
index cff3c594b..8977d8eb2 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
@@ -161,8 +161,7 @@ public class Merge extends SubCommand {
         if (multiMerge) {
             for (final UUID uuid : multiUUID) {
                 PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
-                MainUtil.sendMessage(accepter, "ADDING REQUEST FOR: " + accepter.getName());
-                CmdConfirm.addPending(accepter, "merge request", new Runnable() {
+                CmdConfirm.addPending(accepter, C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", plr.getName()), new Runnable() {
                     @Override
                     public void run() {
                         PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
@@ -170,7 +169,7 @@ public class Merge extends SubCommand {
                         if (multiUUID.size() == 0) {
                             PlotPlayer pp = UUIDHandler.getPlayer(u1);
                             if (pp == null) {
-                                sendMessage(plr, C.MERGE_NOT_VALID);
+                                sendMessage(accepter, C.MERGE_NOT_VALID);
                                 return;
                             }
                             final PlotWorld plotWorld = PlotSquared.getPlotWorld(world);
@@ -200,7 +199,7 @@ public class Merge extends SubCommand {
                     }
                 });
             }
-            MainUtil.sendMessage(plr, "SENT MERGE REQUEST!");
+            MainUtil.sendMessage(plr, C.MERGE_REQUESTED);
             return true;
         }
         final PlotWorld plotWorld = PlotSquared.getPlotWorld(world);
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
index dc7a5b53d..5a003e28e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
@@ -219,6 +219,8 @@ public enum C {
     MERGE_NOT_VALID("$2This merge request is no longer valid."),
     MERGE_ACCEPTED("$2The merge request has been accepted"),
     SUCCESS_MERGE("$2Plots have been merged!"),
+    MERGE_REQUESTED("$2Successfully sent a merge request"),
+    MERGE_REQUEST_CONFIRM("merge request from %s"),
     /*
      * Commands
      */