Workaround to get 1.14 working

This commit is contained in:
Mike Primm 2019-05-03 21:46:06 -05:00
parent 2a2fd9e10b
commit 126ebb7f5c

View file

@ -66,22 +66,19 @@ public class MapChunkCache114 extends AbstractMapChunkCache {
} }
@Override @Override
public boolean loadChunkNoGenerate(World w, int x, int z) { public boolean loadChunkNoGenerate(World w, int x, int z) {
boolean rslt = w.loadChunk(x, z, false); boolean generated = true;
// Workaround for Spigot 1.13.2 bug - check if generated and do load-with-generate if so to drive migration of old chunks // Check one in each direction: see if all are generated
if (!rslt) { for (int xx = x-4; xx <= x+4; xx++) {
boolean generated = true; for (int zz = z-4; zz <= z+4; zz++) {
// Check one in each direction: see if all are generated if (w.isChunkGenerated(xx, zz) == false) {
for (int xx = x-3; xx <= x+3; xx++) { generated = false;
for (int zz = z-3; zz <= z+3; zz++) { break;
if (w.isChunkGenerated(xx, zz) == false) {
generated = false;
break;
}
} }
} }
if (generated) { }
rslt = w.loadChunk(x, z, true); boolean rslt = false;
} if (generated) {
rslt = w.loadChunk(x, z, true);
} }
return rslt; return rslt;
} }