EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-18 05:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Per player plot cluster limits

Browse Source
This commit is contained in:
boy0001
2015-08-28 16:28:55 +10:00
parent 22997ac089
commit 1e8bdb17f8
6 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
View File

@ -27,6 +27,7 @@ import java.util.UUID;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.FlagManager;
@ -142,12 +143,30 @@ public class Cluster extends SubCommand {
Set<Plot> plots = MainUtil.getPlotSelectionOwned(world, pos1, pos2);
if (plots.size() > 0) {
if (!Permissions.hasPermission(plr, "plots.cluster.create.other")) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.create.other");
return false;
UUID uuid = plr.getUUID();
for (Plot plot : plots) {
if (!plot.isOwner(uuid)) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.create.other");
return false;
}
}
}
}
// Set the generator (if applicable)
// Check allowed cluster size
final PlotCluster cluster = new PlotCluster(world, pos1, pos2, UUIDHandler.getUUID(plr));
int current;
if (Settings.GLOBAL_LIMIT) {
current = ClusterManager.getPlayerClusterCount(plr);
}
else {
current = ClusterManager.getPlayerClusterCount(world, plr);
}
int allowed = Permissions.hasPermissionRange(plr, "plots.cluster", Settings.MAX_PLOTS);
if (current + cluster.getArea() > allowed) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster." + (current + cluster.getArea()));
return false;
}
// Set the generator (if applicable)
PlotWorld plotworld = PS.get().getPlotWorld(world);
if (plotworld == null) {
PS.get().config.createSection("worlds." + world);
@ -316,6 +335,20 @@ public class Cluster extends SubCommand {
return false;
}
}
// Check allowed cluster size
int current;
if (Settings.GLOBAL_LIMIT) {
current = ClusterManager.getPlayerClusterCount(plr);
}
else {
current = ClusterManager.getPlayerClusterCount(world, plr);
}
current -= cluster.getArea() + (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
int allowed = Permissions.hasPermissionRange(plr, "plots.cluster", Settings.MAX_PLOTS);
if (current + cluster.getArea() > allowed) {
MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster." + (current + cluster.getArea()));
return false;
}
for (Plot plot : removed) {
FlagManager.removePlotFlag(plot, "cluster");
}