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

Possible build everywhere fix.

Browse Source
This commit is contained in:
MattBDev 2016-05-06 22:03:02 -04:00
parent 1535c5e2f5
commit e63b436edd
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,9 +208,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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER.s(), notifyPerms)) {
return true; return true;
} }
@ -255,9 +255,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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) {
return true; return true;
} }
@ -281,9 +281,9 @@ public abstract class EventUtil {
if (flag.isPresent()) { if (flag.isPresent()) {
value = flag.get(); value = flag.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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) {
return true; return true;
} }
@ -306,9 +306,9 @@ public abstract class EventUtil {
if (flag.isPresent()) { if (flag.isPresent()) {
value = flag.get(); value = flag.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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) {
return true; return true;
} }
@ -323,7 +323,6 @@ public abstract class EventUtil {
if (!plot.hasOwner()) { if (!plot.hasOwner()) {
return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
} }
if (plot.getFlag(Flags.MOB_PLACE).or(false)) { if (plot.getFlag(Flags.MOB_PLACE).or(false)) {
return true; return true;
} }
@ -332,9 +331,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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) {
return true; return true;
} }
@ -351,19 +350,17 @@ public abstract class EventUtil {
if (!plot.hasOwner()) { if (!plot.hasOwner()) {
return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
} }
if (plot.getFlag(Flags.MISC_PLACE).or(false)) { if (plot.getFlag(Flags.MISC_PLACE).or(false)) {
return true; return true;
} }
Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.PLACE); Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.PLACE);
HashSet<PlotBlock> value; HashSet<PlotBlock> value;
if (flag.isPresent()) { if (flag.isPresent()) {
value = flag.get(); value = flag.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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) {
return true; return true;
} }
@ -379,7 +376,6 @@ public abstract class EventUtil {
if (!plot.hasOwner()) { if (!plot.hasOwner()) {
return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
} }
if (plot.getFlag(Flags.VEHICLE_PLACE).or(false)) { if (plot.getFlag(Flags.VEHICLE_PLACE).or(false)) {
return true; return true;
} }
@ -388,9 +384,9 @@ public abstract class EventUtil {
if (flag.isPresent()) { if (flag.isPresent()) {
value = flag.get(); value = flag.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())) {
if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) { if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms)) {
return true; return true;
} }