mirror of
https://github.com/TotalFreedomMC/TF-PlotSquared.git
synced 2024-12-23 00:15:06 +00:00
Option for building restriction on finished plots
This commit is contained in:
parent
be6705241c
commit
be94aa53d3
6 changed files with 12 additions and 9 deletions
|
@ -1795,8 +1795,9 @@ public class PS {
|
|||
config.set("clear.ignore-if-modified", null);
|
||||
|
||||
// Done
|
||||
config.set("approval.ratings.require-done", Settings.REQUIRE_DONE);
|
||||
config.set("approval.done.counts-towards-limit", Settings.DONE_COUNTS_TOWARDS_LIMIT);
|
||||
options.put("approval.ratings.require-done", Settings.REQUIRE_DONE);
|
||||
options.put("approval.done.counts-towards-limit", Settings.DONE_COUNTS_TOWARDS_LIMIT);
|
||||
options.put("approval.done.restrict-building", Settings.DONE_RESTRICTS_BUILDING);
|
||||
|
||||
// Schematics
|
||||
options.put("schematics.save_path", Settings.SCHEMATIC_SAVE_PATH);
|
||||
|
@ -1905,6 +1906,7 @@ public class PS {
|
|||
// Done
|
||||
Settings.REQUIRE_DONE = config.getBoolean("approval.ratings.require-done");
|
||||
Settings.DONE_COUNTS_TOWARDS_LIMIT = config.getBoolean("approval.done.counts-towards-limit");
|
||||
Settings.DONE_RESTRICTS_BUILDING = config.getBoolean("approval.done.restrict-building");
|
||||
|
||||
// Schematics
|
||||
Settings.SCHEMATIC_SAVE_PATH = config.getString("schematics.save_path");
|
||||
|
|
|
@ -88,7 +88,7 @@ public class Clear extends SubCommand {
|
|||
MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
|
||||
return false;
|
||||
}
|
||||
if (FlagManager.isPlotFlagTrue(plot, "done" ) && (!Permissions.hasPermission(plr, "plots.continue") || (Settings.DONE_COUNTS_TOWARDS_LIMIT && MainUtil.getAllowedPlots(plr) >= MainUtil.getPlayerPlotCount(plr)))) {
|
||||
if (Settings.DONE_RESTRICTS_BUILDING && FlagManager.isPlotFlagTrue(plot, "done" ) && (!Permissions.hasPermission(plr, "plots.continue") || (Settings.DONE_COUNTS_TOWARDS_LIMIT && MainUtil.getAllowedPlots(plr) >= MainUtil.getPlayerPlotCount(plr)))) {
|
||||
MainUtil.sendMessage(plr, C.DONE_ALREADY_DONE);
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -46,13 +46,14 @@ public class Settings {
|
|||
*/
|
||||
public static String WEB_URL = "http://empcraft.com/plots/";
|
||||
public static String WEB_IP = "your.ip.here";
|
||||
|
||||
/**
|
||||
* Ratings
|
||||
*/
|
||||
public static List<String> RATING_CATEGORIES = null;
|
||||
public static boolean REQUIRE_DONE = false;
|
||||
public static boolean DONE_COUNTS_TOWARDS_LIMIT = false;
|
||||
public static boolean DONE_RESTRICTS_BUILDING = false;
|
||||
|
||||
/**
|
||||
* PlotMe settings
|
||||
*/
|
||||
|
|
|
@ -656,7 +656,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
|
|||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
else if (plot.getSettings().flags.containsKey("done")) {
|
||||
else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
|
||||
if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
|
||||
event.setCancelled(true);
|
||||
|
@ -2071,7 +2071,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
|
|||
return;
|
||||
}
|
||||
}
|
||||
else if (plot.getSettings().flags.containsKey("done")) {
|
||||
else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
|
||||
if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
|
||||
event.setCancelled(true);
|
||||
|
|
|
@ -28,7 +28,7 @@ public class WEManager {
|
|||
HashSet<RegionWrapper> regions = new HashSet<>();
|
||||
UUID uuid = player.getUUID();
|
||||
for (Plot plot : PS.get().getPlotsInWorld(player.getLocation().getWorld())) {
|
||||
if (plot.isBasePlot() && FlagManager.getPlotFlag(plot, "done") == null) {
|
||||
if (Settings.DONE_RESTRICTS_BUILDING && plot.isBasePlot() && FlagManager.getPlotFlag(plot, "done") == null) {
|
||||
if (Settings.WE_ALLOW_HELPER ? plot.isAdded(uuid) : (plot.isOwner(uuid) || plot.getTrusted().contains(uuid))) {
|
||||
Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
|
||||
Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
|
||||
|
|
|
@ -515,7 +515,7 @@ public class MainListener {
|
|||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
else if (plot.getSettings().flags.containsKey("done")) {
|
||||
else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
|
||||
if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
|
||||
event.setCancelled(true);
|
||||
|
@ -568,7 +568,7 @@ public class MainListener {
|
|||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
else if (plot.getSettings().flags.containsKey("done")) {
|
||||
else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
|
||||
if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
|
||||
MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
|
||||
event.setCancelled(true);
|
||||
|
|
Loading…
Reference in a new issue