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

Recover from invalid merge

Browse Source
This commit is contained in:
boy0001
2015-03-23 01:43:19 +11:00
parent d9124dcfb8
commit 96eb4af557
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1095,12 +1095,21 @@ public class MainUtil {
public static Plot getTopPlot(final Plot plot) {
if (plot.settings.getMerged(2)) {
return getTopPlot(PlotSquared.getPlots(plot.world).get(new PlotId(plot.id.x, plot.id.y + 1)));
final Plot p = PlotSquared.getPlots(plot.world).get(new PlotId(plot.id.x, plot.id.y + 1));
if (p == null) {
return plot;
}
return getTopPlot(p);
}
if (plot.settings.getMerged(1)) {
return getTopPlot(PlotSquared.getPlots(plot.world).get(new PlotId(plot.id.x + 1, plot.id.y)));
final Plot p = PlotSquared.getPlots(plot.world).get(new PlotId(plot.id.x + 1, plot.id.y));
if (p == null) {
return plot;
}
return getTopPlot(p);
}
return plot;
}
public static PlotId getSize(final String world, final Plot plot) {