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

*

Browse Source
This commit is contained in:
Jesse Boyd 2016-05-20 03:29:51 +10:00
parent 5665e9b709
commit 82e162ae00
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,7 +557,6 @@ public class Plot {
case 7: case 7:
int i = direction - 4; int i = direction - 4;
int i2 = 0; int i2 = 0;
System.out.println("CHECK 7 " + this + " | " + this.id.getRelative(i) + " | " + this.id.getRelative(i2) + " | " + i + " | " + i2);
if (this.getSettings().getMerged(i2)) { if (this.getSettings().getMerged(i2)) {
if (this.getSettings().getMerged(i)) { if (this.getSettings().getMerged(i)) {
if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) { if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
@ -2643,12 +2642,10 @@ public class Plot {
lesserPlot.setMerged(2, true); lesserPlot.setMerged(2, true);
greaterPlot.setMerged(0, true); greaterPlot.setMerged(0, true);
lesserPlot.mergeData(greaterPlot); lesserPlot.mergeData(greaterPlot);
System.out.println(greaterPlot + " | " + lesserPlot);
if (removeRoads) { if (removeRoads) {
lesserPlot.removeRoadSouth(); lesserPlot.removeRoadSouth();
Plot diagonal = greaterPlot.getRelative(1); Plot diagonal = greaterPlot.getRelative(1);
if (diagonal.getMerged(7)) { if (diagonal.getMerged(7)) {
System.out.println(lesserPlot + " SOUTHEAST 1");
lesserPlot.removeRoadSouthEast(); lesserPlot.removeRoadSouthEast();
} }
Plot below = greaterPlot.getRelative(3); Plot below = greaterPlot.getRelative(3);
@ -2669,11 +2666,9 @@ public class Plot {
lesserPlot.setMerged(1, true); lesserPlot.setMerged(1, true);
greaterPlot.setMerged(3, true); greaterPlot.setMerged(3, true);
lesserPlot.mergeData(greaterPlot); lesserPlot.mergeData(greaterPlot);
System.out.println(greaterPlot + " | " + lesserPlot);
if (removeRoads) { if (removeRoads) {
Plot diagonal = greaterPlot.getRelative(1); Plot diagonal = greaterPlot.getRelative(1);
if (diagonal.getMerged(7)) { if (diagonal.getMerged(7)) {
System.out.println(lesserPlot + " SOUTHEAST 2");
lesserPlot.removeRoadSouthEast(); lesserPlot.removeRoadSouthEast();
} }
lesserPlot.removeRoadEast(); lesserPlot.removeRoadEast();

2
Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
View File

@ -58,7 +58,7 @@ public class SpongeAugmentedGenerator implements GenerationPopulator {
} }
@Override @Override
public void setBiome(int x, int z, int biome) { public void setBiome(int x, int z, int biome) {
System.out.println("TODO set biome: " + biome); // TODO FIXME // TODO FIXME
} }
@Override @Override
public PlotChunk clone() { public PlotChunk clone() {