Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-13 10:34:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

should fix #106 (testing needed)

Browse Source
This commit is contained in:
Jesse Boyd 2015-01-23 18:17:53 -07:00
parent aabbd851ec
commit ee804a8148
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,16 +170,20 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
return;
}
}
if (enteredPlot(f, q)) {
final Plot plot = getCurrentPlot(q);
final boolean admin = PlotMain.hasPermission(player, "plots.admin.entry.denied");
if (plot.deny_entry(player) && !admin) {
event.setCancelled(true);
Plot plot = getCurrentPlot(q);
if (plot != null) {
if (!plot.equals(getCurrentPlot(f))) {
event.setCancelled(true);
return;
}
plotEntry(player, plot);
}
if (plot.deny_entry(player)) {
if (!PlotMain.hasPermission(player, "plots.admin.entry.denied")) {
event.setCancelled(true);
return;
}
}
} else if (leftPlot(f, q)) {
final Plot plot = getCurrentPlot(event.getFrom());
plot = getCurrentPlot(event.getFrom());
plotExit(player, plot);
}
}