mirror of
https://github.com/TotalFreedomMC/TF-PlotSquared.git
synced 2025-08-08 13:33:11 +00:00
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:
parent
8ee90263bb
commit
3a1577469b
54 changed files with 853 additions and 353 deletions
|
@ -37,7 +37,7 @@ import com.intellectualcrafters.plot.util.CmdConfirm;
|
|||
import com.intellectualcrafters.plot.util.EconHandler;
|
||||
import com.intellectualcrafters.plot.util.EventUtil;
|
||||
import com.intellectualcrafters.plot.util.MainUtil;
|
||||
import com.intellectualcrafters.plot.util.Permissions;
|
||||
import com.intellectualcrafters.plot.util.Perm;
|
||||
import com.intellectualcrafters.plot.util.bukkit.UUIDHandler;
|
||||
|
||||
/**
|
||||
|
@ -84,7 +84,7 @@ public class Merge extends SubCommand {
|
|||
MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
|
||||
return false;
|
||||
}
|
||||
final boolean admin = Permissions.hasPermission(plr, "plots.admin.command.merge");
|
||||
final boolean admin = Perm.hasPermission(plr, "plots.admin.command.merge");
|
||||
if (!plot.isOwner(plr.getUUID()) && !admin) {
|
||||
MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
|
||||
return false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue