Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-29 04:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge flags to master

Browse Source
This commit is contained in:
MattBDev 2016-04-22 23:54:19 -04:00
commit c266b1a428
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java
View File

@ -41,8 +41,11 @@ public class Download extends SubCommand {
MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
return false;
}
if ((!plot.isOwner(plr.getUUID()) || (Settings.DOWNLOAD_REQUIRES_DONE && plot.getFlag(Flags.DONE).isPresent())) && !Permissions
.hasPermission(plr, "plots.admin.command.download")) {
if ((Settings.DOWNLOAD_REQUIRES_DONE && (FlagManager.getPlotFlagRaw(plot, "done") == null)) && !Permissions.hasPermission(plr, "plots.admin.command.download")) {
MainUtil.sendMessage(plr, C.DONE_NOT_DONE);
return false;
}
if ((!plot.isOwner(plr.getUUID()))) {
MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
return false;
}

1
Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
View File

@ -236,7 +236,6 @@ public abstract class EventUtil {
return true;
}
if (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) {
// TODO: fix the commented dead code
return true; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s()));
}
return true;