Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-02 08:50:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean merge up

Browse Source
This commit is contained in:
dordsor21 2018-12-28 17:03:00 +00:00
parent 6292bff7c9
commit 750be6c5fe
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
View File

@ -55,7 +55,7 @@ public class Merge extends SubCommand {
MainUtil.sendMessage(player, C.NO_PLOT_PERMS); MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
return false; return false;
} else { } else {
uuid = plot.owner; uuid = plot.guessOwner();
} }
} }
final PlotArea plotArea = plot.getArea(); final PlotArea plotArea = plot.getArea();
@ -155,25 +155,23 @@ public class Merge extends SubCommand {
} }
isOnline = true; isOnline = true;
final int dir = direction; final int dir = direction;
Runnable run = new Runnable() { Runnable run = () -> {
@Override public void run() { MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED);
MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED); plot.autoMerge(dir, maxSize - size, owner, terrain);
plot.autoMerge(dir, maxSize - size, owner, terrain); PlotPlayer plotPlayer = UUIDHandler.getPlayer(player.getUUID());
PlotPlayer plotPlayer = UUIDHandler.getPlayer(player.getUUID()); if (plotPlayer == null) {
if (plotPlayer == null) { sendMessage(accepter, C.MERGE_NOT_VALID);
sendMessage(accepter, C.MERGE_NOT_VALID); return;
}
if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
if (EconHandler.manager.getMoney(player) < price) {
sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
return; return;
} }
if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) { EconHandler.manager.withdrawMoney(player, price);
if (EconHandler.manager.getMoney(player) < price) { sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
return;
}
EconHandler.manager.withdrawMoney(player, price);
sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
}
MainUtil.sendMessage(player, C.SUCCESS_MERGE);
} }
MainUtil.sendMessage(player, C.SUCCESS_MERGE);
}; };
if (hasConfirmation(player)) { if (hasConfirmation(player)) {
CmdConfirm.addPending(accepter, CmdConfirm.addPending(accepter,