Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2020-11-25 02:12:41 -04:00
commit 253604b34a
18 files changed
+381 -32

No files matched your search

@@ -577,6 +577,7 @@ public class Auxiliary {
expression.addLazyFunction("seed", -1, (c, t, lv) -> {
ServerCommandSource s = ((CarpetContext)c).s;
c.host.issueDeprecation("seed()");
Value ret = new NumericValue(s.getWorld().getSeed());
return (cc, tt) -> ret;
});
@@ -785,6 +786,7 @@ public class Auxiliary {
boolean shared = false;
if (lv.size()>0)
{
c.host.issueDeprecation("load_app_data(...) with arguments");
file = recognizeResource(lv.get(0).evalValue(c));
if (lv.size() > 1)
{
@@ -807,6 +809,7 @@ public class Auxiliary {
boolean shared = false;
if (lv.size()>1)
{
c.host.issueDeprecation("store_app_data(...) with more than one argument");
file = recognizeResource(lv.get(1).evalValue(c));
if (lv.size() > 2)
{