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

Here you go.

Browse Source
This commit is contained in:
boy0001
2015-09-03 22:40:36 +10:00
parent dfc32741fa
commit 4e321d2b27
9 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
View File

@ -130,7 +130,7 @@ public class ExpireManager {
}
}
if (plot.isMerged()) {
MainUtil.unlinkPlot(plot);
MainUtil.unlinkPlot(plot, true);
}
plot.deletePlot(null);
expiredPlots.get(world).remove(plot);

4
src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -298,7 +298,7 @@ public class MainUtil {
return MainUtil.mergePlots(world, plotIds, true, true);
}
public static boolean unlinkPlot(final Plot plot) {
public static boolean unlinkPlot(final Plot plot, boolean createRoad) {
final String world = plot.world;
final PlotId pos1 = MainUtil.getBottomPlot(plot).id;
final PlotId pos2 = MainUtil.getTopPlot(plot).id;
@ -324,7 +324,7 @@ public class MainUtil {
myplot.getSettings().setMerged(new boolean[] { false, false, false, false });
DBFunc.setMerged(myplot, myplot.getSettings().getMerged());
}
if (plotworld.TERRAIN != 3) {
if (plotworld.TERRAIN != 3 && createRoad) {
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
final boolean lx = x < pos2.x;

1
src/main/java/com/intellectualcrafters/plot/util/Permissions.java
View File

@ -53,7 +53,6 @@ public class Permissions {
if (player.hasPermission(stub + ".*")) {
return Integer.MAX_VALUE;
}
System.out.print(range);
for (int i = range; i > 0; i--) {
if (player.hasPermission(stub + "." + i)) {
return i;