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

Fixes #1116

Browse Source
This commit is contained in:
Jesse Boyd 2016-05-15 01:54:12 +10:00
parent c70c2283a2
commit 64f3e8f79b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,9 +188,9 @@ public abstract class EventUtil {
if (flagValue.isPresent()) { if (flagValue.isPresent()) {
value = flagValue.get(); value = flagValue.get();
} else { } else {
return true; value = null;
} }
if (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) { if (value == null || !value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) {
return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms) || !(!notifyPerms || MainUtil return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms) || !(!notifyPerms || MainUtil
.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s())); .sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s()));
} }
@ -233,10 +233,13 @@ public abstract class EventUtil {
if (flagValue.isPresent()) { if (flagValue.isPresent()) {
value = flagValue.get(); value = flagValue.get();
} else { } else {
return true; value = null;
} }
if (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) { if (value == null || !value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) {
return true; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s())); if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER.s(), false)) {
return true;
}
return false;
} }
return true; return true;
} }
@ -275,7 +278,6 @@ public abstract class EventUtil {
if (plot.getFlag(Flags.MISC_INTERACT).or(false)) { if (plot.getFlag(Flags.MISC_INTERACT).or(false)) {
return true; return true;
} }
Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE); Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE);
HashSet<PlotBlock> value; HashSet<PlotBlock> value;
if (flag.isPresent()) { if (flag.isPresent()) {