| Chunk |
|---|
| Conflicting content |
|---|
for (int y = 0; y < t.size; y++) {
int mx = x + t.x * t.size;
int mz = y + t.y * t.size;
<<<<<<< HEAD
int my = w.getHighestBlockYAt(mx, mz) - 1;
int blockType = w.getBlockTypeIdAt(mx, my, mz);
byte data = 0;
if(colorScheme.datacolors[blockType] != null) { /* If data colored */
data = w.getBlockAt(mx, my, mz).getData();
}
Color[] colors;
if(data != 0)
colors = colorScheme.datacolors[blockType][data];
else
colors = colorScheme.colors[blockType];
=======
int my;
int blockType;
if(isnether) {
/* Scan until we hit air */
my = 127;
while((blockType = w.getBlockTypeIdAt(mx, my, mz)) != 0) {
my--;
if(my < 0) { /* Solid - use top */
my = 127;
blockType = w.getBlockTypeIdAt(mx, my, mz);
break;
}
}
if(blockType == 0) { /* Hit air - now find non-air */
while((blockType = w.getBlockTypeIdAt(mx, my, mz)) == 0) {
my--;
if(my < 0) {
my = 0;
break;
}
}
}
}
else {
my = w.getHighestBlockYAt(mx, mz) - 1;
if(my > maximumHeight) my = maximumHeight;
blockType = w.getBlockTypeIdAt(mx, my, mz);
}
byte data = 0;
Color[] colors = colorScheme.colors[blockType];
if(colorScheme.datacolors[blockType] != null) {
data = w.getBlockAt(mx, my, mz).getData();
colors = colorScheme.datacolors[blockType][data];
}
>>>>>>> 4a17f87691231e8063a04de08a2301028cdc7095
if (colors == null)
continue;
Color c = colors[0]; |
| Solution content |
|---|
else {
for (int y = 0; y < t.size; y++) {
int mx = x + t.x * t.size;
int mz = y + t.y * t.size;
int my;
int blockType;
if(isnether) {
/* Scan until we hit air */
my = 127;
while((blockType = w.getBlockTypeIdAt(mx, my, mz)) != 0) {
my--;
if(my < 0) { /* Solid - use top */
my = 127;
blockType = w.getBlockTypeIdAt(mx, my, mz);
break;
}
}
if(blockType == 0) { /* Hit air - now find non-air */
while((blockType = w.getBlockTypeIdAt(mx, my, mz)) == 0) {
my--;
if(my < 0) {
my = 0;
break;
}
}
}
}
my = w.getHighestBlockYAt(mx, mz) - 1;
if(my > maximumHeight) my = maximumHeight;
blockType = w.getBlockTypeIdAt(mx, my, mz);
}
byte data = 0;
Color[] colors = colorScheme.colors[blockType];
if(colorScheme.datacolors[blockType] != null) {
data = w.getBlockAt(mx, my, mz).getData();
colors = colorScheme.datacolors[blockType][data];
}
if (colors == null)
continue;
Color c = colors[0]; |
| File |
|---|
| FlatMap.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Array access |
| If statement |
| Method invocation |
| Variable |