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-12-28 16:10:01 -04:00
2 parents 025855af42 8d17abfbe8
commit e069e1485d
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/CarpetExpression.java
+4 -2
View File
@@ -219,11 +219,13 @@ public class CarpetExpression
Value v0 = params.get(0).evalValue(c); Value v0 = params.get(0).evalValue(c);
if (v0 instanceof BlockValue) if (v0 instanceof BlockValue)
{ {
Value retval = new StringValue(test.apply( ((BlockValue) v0).getBlockState(), ((BlockValue) v0).getPos())); String strVal = test.apply( ((BlockValue) v0).getBlockState(), ((BlockValue) v0).getPos());
Value retval = strVal != null ? new StringValue(strVal) : Value.NULL;
return (c_, t_) -> retval; return (c_, t_) -> retval;
} }
BlockValue block = BlockValue.fromParams(cc, params, 0).block; BlockValue block = BlockValue.fromParams(cc, params, 0).block;
Value retval = new StringValue(test.apply(block.getBlockState(), block.getPos())); String strVal = test.apply(block.getBlockState(), block.getPos());
Value retval = strVal != null ? new StringValue(strVal) : Value.NULL;
return (c_, t_) -> retval; return (c_, t_) -> retval;
} }