Merge remote-tracking branch 'origin/1.15' into 1.15

Dieser Commit ist enthalten in:
MattBDev 2020-04-01 13:09:15 -04:00
Commit e223f77825
3 geänderte Dateien mit 10 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -9,9 +9,9 @@ public class MapChunkUtil_1_15_2 extends MapChunkUtil<PacketPlayOutMapChunk> {
fieldZ = PacketPlayOutMapChunk.class.getDeclaredField("b");
fieldBitMask = PacketPlayOutMapChunk.class.getDeclaredField("c");
fieldHeightMap = PacketPlayOutMapChunk.class.getDeclaredField("d");
fieldChunkData = PacketPlayOutMapChunk.class.getDeclaredField("e");
fieldBlockEntities = PacketPlayOutMapChunk.class.getDeclaredField("f");
fieldFull = PacketPlayOutMapChunk.class.getDeclaredField("g");
fieldChunkData = PacketPlayOutMapChunk.class.getDeclaredField("f");
fieldBlockEntities = PacketPlayOutMapChunk.class.getDeclaredField("g");
fieldFull = PacketPlayOutMapChunk.class.getDeclaredField("h");
fieldX.setAccessible(true);
fieldZ.setAccessible(true);
fieldBitMask.setAccessible(true);

Datei anzeigen

@ -156,7 +156,12 @@ public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implemen
}
if (Fawe.isMainThread()) {
return (V) chunk.call();
V result = (V)chunk.call();
if (result == null){
return (V) (Future) Futures.immediateFuture(null);
}else{
return result;
}
}
return (V) Fawe.get().getQueueHandler().submit(chunk);

Datei anzeigen

@ -108,7 +108,7 @@ public class MaskingExtent extends AbstractDelegateExtent implements IBatchProce
@Override
public void applyBlock(FilterBlock block) {
int ordinal = block.getOrdinal();
if (ordinal != 0 && !mask.test(getExtent(), block)) {
if (!mask.test(getExtent(), block)) {
block.setOrdinal(0);
}
}