icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source
This commit is contained in:
gnembon committed 2019-11-07 07:59:05 -04:00
2 parents 24d4159f9f 4997fa5a44
commit 718fb38d7d
1 file changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/CarpetExpression.java
+8 -2
View File
@@ -808,8 +808,14 @@ public class CarpetExpression
this.expr.addLazyFunction("generation_status", -1, (c, t, lv) ->
{
BlockPos pos = BlockValue.fromParams((CarpetContext)c, lv, 0).block.getPos();
Chunk chunk = ((CarpetContext)c).s.getWorld().getChunk(pos.getX()>>4, pos.getZ()>>4, ChunkStatus.EMPTY);
BlockValue.LocatorResult locatorResult = BlockValue.fromParams((CarpetContext)c, lv, 0);
BlockPos pos = locatorResult.block.getPos();
boolean forceLoad = false;
if (lv.size() > locatorResult.offset)
forceLoad = lv.get(locatorResult.offset).evalValue(c, Context.BOOLEAN).getBoolean();
Chunk chunk = ((CarpetContext)c).s.getWorld().getChunk(pos.getX()>>4, pos.getZ()>>4, ChunkStatus.EMPTY, forceLoad);
if (chunk == null)
return LazyValue.NULL;
Value retval = new StringValue(chunk.getStatus().getName());
return (c_, t_) -> retval;
});