Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 12:35:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #17

Browse Source 
Creates #32
This commit is contained in:
Sauilitired 2014-11-02 20:11:06 +01:00
parent 291c290f15
commit c883f2f7d9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
View File

@ -1289,7 +1289,9 @@ public class PlotMain extends JavaPlugin {
"instabreak", "instabreak",
"drop-protection", "drop-protection",
"forcefield", "forcefield",
"titles" "titles",
"pve",
"pvp"
); );
List<String> intervalFlags = Arrays.asList( List<String> intervalFlags = Arrays.asList(
"feed", "feed",

8
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
View File

@ -730,10 +730,16 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
if (!PlotMain.hasPermission(p,"plots.admin")) { if (!PlotMain.hasPermission(p,"plots.admin")) {
PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS); PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
e.setCancelled(true); e.setCancelled(true);
return;
} }
} }
else else
if (!plot.hasRights(p)) { if(aPlr && !booleanFlag(plot, "pvp"))
return;
if(!aPlr && !booleanFlag(plot, "pve"))
return;
assert plot != null;
if (!plot.hasRights(p)) {
if (!PlotMain.hasPermission(p,"plots.admin")) { if (!PlotMain.hasPermission(p,"plots.admin")) {
PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS); PlayerFunctions.sendMessage(p, C.NO_PLOT_PERMS);
e.setCancelled(true); e.setCancelled(true);