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

@ -31,7 +31,7 @@ import com.intellectualcrafters.plot.object.PlotWorld;
import com.intellectualcrafters.plot.util.CmdConfirm;
import com.intellectualcrafters.plot.util.EconHandler;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.Perm;
import com.intellectualcrafters.plot.util.TaskManager;
import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
@ -50,7 +50,7 @@ public class Delete extends SubCommand {
if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
return !sendMessage(plr, C.UNLINK_REQUIRED);
}
if ((((plot == null) || !plot.hasOwner() || !plot.isOwner(UUIDHandler.uuidWrapper.getUUID(plr)))) && !Permissions.hasPermission(plr, "plots.admin.command.delete")) {
if ((((plot == null) || !plot.hasOwner() || !plot.isOwner(UUIDHandler.uuidWrapper.getUUID(plr)))) && !Perm.hasPermission(plr, "plots.admin.command.delete")) {
return !sendMessage(plr, C.NO_PLOT_PERMS);
}
assert plot != null;
@ -83,7 +83,7 @@ public class Delete extends SubCommand {
DBFunc.delete(plot);
}
};
if (Settings.CONFIRM_DELETE && !(Permissions.hasPermission(plr, "plots.confirm.bypass"))) {
if (Settings.CONFIRM_DELETE && !(Perm.hasPermission(plr, "plots.confirm.bypass"))) {
CmdConfirm.addPending(plr, "/plot delete " + plot.id, runnable);
}
else {