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

Some fixes

Browse Source 
Fixes #641
Closes #640 (need to also update Plot2Dynmap)
Fixes #637 (duplicate)
Fixes #636
Fixes #634
This commit is contained in:
boy0001
2015-09-26 18:05:27 +10:00
parent d42ef3cf63
commit a93e8fac38
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2127,7 +2127,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 0));
if (!tmp.getMerged(2)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(2, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}
@ -2138,7 +2138,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 1));
if (!tmp.getMerged(3)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(3, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}
@ -2149,7 +2149,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 2));
if (!tmp.getMerged(0)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(0, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}
@ -2160,7 +2160,7 @@ public class MainUtil {
tmp = getPlotAbs(plot.world, getPlotIdRelative(plot.id, 3));
if (!tmp.getMerged(1)) {
// invalid merge
PS.debug("Fixing invalid merge: " + plot);
PS.debug("Fixing invalid merge: " + plot);
tmp.getSettings().setMerged(1, true);
DBFunc.setMerged(tmp, tmp.settings.getMerged());
}