Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-07-01 14:54:04 -03:00
commit c69f65e68e
8 files changed
+48 -8

No files matched your search

@@ -3196,9 +3196,8 @@ public class CarpetExpression
BlockArgument locator = BlockArgument.findIn(cc, lv, 0);
BlockPos pos = locator.block.getPos();
ServerWorld world = cc.s.getWorld();
((ServerLightingProviderInterface)world.getChunkManager().getLightingProvider()).resetLight(world.getChunk(pos), new ChunkPos(pos)); //light(world.getChunk(pos), false);
((ThreadedAnvilChunkStorageInterface) world.getChunkManager().threadedAnvilChunkStorage).relightChunk(new ChunkPos(pos));
forceChunkUpdate(pos, world);
world.getChunkManager().getLightingProvider().light(world.getChunk(pos), false);
return LazyValue.TRUE;
});