TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2025-08-07 04:53:00 +00:00
Code Issues Projects Releases Wiki Activity

plot merging + '* UUID

Browse source
This commit is contained in:
boy0001 2015-01-06 14:33:37 +11:00
parent f8c543b56c
commit 6b988f616a
6 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/PlotHelper.java
View file

@ -166,15 +166,17 @@ import java.util.UUID;
plot2.settings.setMerged(0, true);
}
}
if (changed) {
result = true;
DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged());
if (plot2 != null) {
DBFunc.setMerged(world.getName(), plot2, plot2.settings.getMerged());
}
}
}
}
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
final PlotId id = new PlotId(x, y);
final Plot plot = PlotMain.getPlots(world).get(id);
DBFunc.setMerged(world.getName(), plot, plot.settings.getMerged());
}
}
manager.finishPlotMerge(world, plotworld, plotIds);