EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix #1222

Browse Source
This commit is contained in:
Jesse Boyd 2016-06-27 17:45:19 +10:00
parent 96d0bb0e5e
commit 047f9a75b9
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -2681,7 +2681,7 @@ public class Plot {
greaterPlot.setMerged(3, true); greaterPlot.setMerged(3, true);
lesserPlot.mergeData(greaterPlot); lesserPlot.mergeData(greaterPlot);
if (removeRoads) { if (removeRoads) {
Plot diagonal = greaterPlot.getRelative(1); Plot diagonal = greaterPlot.getRelative(2);
if (diagonal.getMerged(7)) { if (diagonal.getMerged(7)) {
lesserPlot.removeRoadSouthEast(); lesserPlot.removeRoadSouthEast();
} }

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

@ -300,7 +300,7 @@ public class ExpireManager {
} }
}, 86400000); }, 86400000);
} else { } else {
TaskManager.runTaskLaterAsync(this, 20); TaskManager.runTaskLaterAsync(this, 20 * 10);
} }
} }
}); });

4
Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java
View File

@ -1,4 +0,0 @@
package com.intellectualcrafters.plot.util.expiry;
public class ExpirySettings {
}