TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-08 21:43:11 +00:00
Code Issues Projects Releases Wiki Activity

cmd

Browse source
This commit is contained in:
boy0001 2015-02-21 23:01:15 +11:00
parent 50c80ba5c4
commit 1eb0ba47b4
30 changed files with 37 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View file

@ -78,7 +78,7 @@ public class Merge extends SubCommand {
MainUtil.sendMessage(plr, C.NOT_IN_PLOT);
return true;
}
final Plot plot = BukkitPlayerFunctions.getCurrentPlot(plr);
final Plot plot = MainUtil.getPlot(loc);
if ((plot == null) || !plot.hasOwner()) {
MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
return false;