Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MattBDev 2020-04-01 13:09:15 -04:00
commit e223f77825
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/MapChunkUtil_1_15_2.java
View File

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

7
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/SingleThreadQueueExtent.java
View File

@ -156,7 +156,12 @@ public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implemen
} }
if (Fawe.isMainThread()) { 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); return (V) Fawe.get().getQueueHandler().submit(chunk);

2
worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java
View File

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