Various changes

Permissions:
- Changed permissions class to an enum
- started using some permissions for EventUtil

Events:
- fixed armor stands being placed outside allowed area
- fixed item frames and paintings being placeable outside allowed area
- fixed eating and reading being restricted where it shouldn't
- Added various new flags for fine tuned protection
- Recoded the result of multiple flags to be more logical
- recoded player interact event
- fixed ender dragon egg teleportation onto other plots
- tried centralizing some logic to the EventUtil class

PlotAPI:
- minor tweaks to the PlotAPI class

PlotSquared updater:
- removed some debug
- testing a bit more

Chunk sending:
- fixed plot clearing, and related block changes not sending chunk
updates to 1.7.10 clients

TODO:
- verify all works
- finish centralizing event system
This commit is contained in:
boy0001 2015-07-10 00:20:19 +10:00
parent 8ee90263bb
commit 3a1577469b
54 changed files with 853 additions and 353 deletions

View file

@ -353,7 +353,7 @@ public class MainUtil {
else {
location = getDefaultHome(plot);
}
if ((Settings.TELEPORT_DELAY == 0) || Permissions.hasPermission(player, "plots.teleport.delay.bypass")) {
if ((Settings.TELEPORT_DELAY == 0) || Perm.hasPermission(player, "plots.teleport.delay.bypass")) {
sendMessage(player, C.TELEPORTED_TO_PLOT);
player.teleport(location);
return true;
@ -1093,7 +1093,7 @@ public class MainUtil {
if (Settings.ENABLE_CLUSTERS) {
PlotCluster cluster = ClusterManager.getCluster(plot);
if (cluster != null) {
if (!cluster.isAdded(player.getUUID()) && !Permissions.hasPermission(player, "plots.admin.command.claim")) {
if (!cluster.isAdded(player.getUUID()) && !Perm.hasPermission(player, "plots.admin.command.claim")) {
return false;
}
}
@ -1558,7 +1558,7 @@ public class MainUtil {
* @return int
*/
public static int getAllowedPlots(final PlotPlayer p) {
return Permissions.hasPermissionRange(p, "plots.plot", Settings.MAX_PLOTS);
return Perm.hasPermissionRange(p, "plots.plot", Settings.MAX_PLOTS);
}
public static Plot getPlot(final Location loc) {