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

Fixed errors.

Browse source
This commit is contained in:
boy0001 2015-03-20 14:00:02 +11:00
parent bdbebfa29d
commit fbaca34218
25 changed files with 92 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ public class Merge extends SubCommand {
return false;
}
final boolean admin = Permissions.hasPermission(plr, "plots.admin.command.merge");
if (!plot.getOwner().equals(UUIDHandler.getUUID(plr)) && !admin) {
if (!plot.isOwner(plr.getUUID()) && !admin) {
MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
return false;
}
@ -138,10 +138,10 @@ public class Merge extends SubCommand {
boolean multiMerge = false;
final HashSet<UUID> multiUUID = new HashSet<UUID>();
HashSet<PlotId> multiPlots = new HashSet<>();
final UUID u1 = plot.getOwner();
final UUID u1 = plot.owner_;
for (final PlotId myid : plots) {
final Plot myplot = PlotSquared.getPlots(world).get(myid);
UUID u2 = myplot.getOwner();
UUID u2 = myplot.owner_;
if (myplot == null || u2 == null) {
MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
return false;
@ -190,7 +190,7 @@ public class Merge extends SubCommand {
}
MainUtil.sendMessage(plr, C.SUCCESS_MERGE);
MainUtil.mergePlots(world, plots, true);
MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
MainUtil.setSign(UUIDHandler.getName(plot.owner_), plot);
MainUtil.update(loc);
}
MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED);
@ -219,7 +219,7 @@ public class Merge extends SubCommand {
}
MainUtil.sendMessage(plr, C.SUCCESS_MERGE);
MainUtil.mergePlots(world, plots, true);
MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
MainUtil.setSign(UUIDHandler.getName(plot.owner_), plot);
MainUtil.update(loc);
return true;
}