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

Merge branch 'master' into 1.17

Browse Source 
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/mixins/World_movableTEMixin.java
This commit is contained in:
gnembon committed 2020-11-06 21:56:47 -04:00
2 parents 410b61b624 c326785fb9
commit 94b47c1272
1 file changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/api/Auxiliary.java
+1 -2
View File
@@ -614,7 +614,7 @@ public class Auxiliary {
return (cc, tt) -> retval; return (cc, tt) -> retval;
}); });
expression.addLazyFunction("plop", 4, (c, t, lv) ->{ expression.addLazyFunction("plop", -1, (c, t, lv) ->{
BlockArgument locator = BlockArgument.findIn((CarpetContext)c, lv, 0); BlockArgument locator = BlockArgument.findIn((CarpetContext)c, lv, 0);
if (lv.size() <= locator.offset) if (lv.size() <= locator.offset)
throw new InternalExpressionException("'plop' needs extra argument indicating what to plop"); throw new InternalExpressionException("'plop' needs extra argument indicating what to plop");
@@ -624,7 +624,6 @@ public class Auxiliary {
{ {
Boolean res = FeatureGenerator.plop(what, ((CarpetContext) c).s.getWorld(), locator.block.getPos()); Boolean res = FeatureGenerator.plop(what, ((CarpetContext) c).s.getWorld(), locator.block.getPos());
//Boolean res = FeatureGenerator.spawn(what, ((CarpetContext) c).s.getWorld(), locator.block.getPos());
if (res == null) if (res == null)
return; return;
if (what.equalsIgnoreCase("boulder")) // there might be more of those if (what.equalsIgnoreCase("boulder")) // there might be more of those