EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

*yet another fix

Browse Source
This commit is contained in:
boy0001 2015-03-21 00:43:21 +11:00
parent c9b621ce59
commit ab8ece4b6d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -161,8 +161,7 @@ public class Merge extends SubCommand {
if (multiMerge) { if (multiMerge) {
for (final UUID uuid : multiUUID) { for (final UUID uuid : multiUUID) {
PlotPlayer accepter = UUIDHandler.getPlayer(uuid); PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
MainUtil.sendMessage(accepter, "ADDING REQUEST FOR: " + accepter.getName()); CmdConfirm.addPending(accepter, C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", plr.getName()), new Runnable() {
CmdConfirm.addPending(accepter, "merge request", new Runnable() {
@Override @Override
public void run() { public void run() {
PlotPlayer accepter = UUIDHandler.getPlayer(uuid); PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
@ -170,7 +169,7 @@ public class Merge extends SubCommand {
if (multiUUID.size() == 0) { if (multiUUID.size() == 0) {
PlotPlayer pp = UUIDHandler.getPlayer(u1); PlotPlayer pp = UUIDHandler.getPlayer(u1);
if (pp == null) { if (pp == null) {
sendMessage(plr, C.MERGE_NOT_VALID); sendMessage(accepter, C.MERGE_NOT_VALID);
return; return;
} }
final PlotWorld plotWorld = PlotSquared.getPlotWorld(world); 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; return true;
} }
final PlotWorld plotWorld = PlotSquared.getPlotWorld(world); final PlotWorld plotWorld = PlotSquared.getPlotWorld(world);

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -219,6 +219,8 @@ public enum C {
MERGE_NOT_VALID("$2This merge request is no longer valid."), MERGE_NOT_VALID("$2This merge request is no longer valid."),
MERGE_ACCEPTED("$2The merge request has been accepted"), MERGE_ACCEPTED("$2The merge request has been accepted"),
SUCCESS_MERGE("$2Plots have been merged!"), SUCCESS_MERGE("$2Plots have been merged!"),
MERGE_REQUESTED("$2Successfully sent a merge request"),
MERGE_REQUEST_CONFIRM("merge request from %s"),
/* /*
* Commands * Commands
*/ */