Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-04-19 23:35:30 -03:00
commit 5cceec9486
2 files changed
+4 -4

No files matched your search

@@ -23,7 +23,7 @@ import carpet.script.exception.ExitStatement;
import carpet.script.exception.InternalExpressionException;
import carpet.script.exception.ThrowStatement;
import carpet.script.exception.Throwables;
import carpet.script.utils.FixedCommandSource;
import carpet.script.utils.SnoopyCommandSource;
import carpet.script.utils.InputValidator;
import carpet.script.utils.ScarpetJsonDeserializer;
import carpet.script.utils.ShapeDispatcher;
@@ -672,7 +672,7 @@ public class Auxiliary {
Value[] error = {Value.NULL};
List<Value> output = new ArrayList<>();
Value retval = new NumericValue(s.getMinecraftServer().getCommandManager().execute(
new FixedCommandSource(s, posf, error, output),
new SnoopyCommandSource(s, posf, error, output),
lv.get(0).evalValue(c).getString())
);
Value ret = ListValue.of(retval, ListValue.wrap(output), error[0]);
@@ -21,7 +21,7 @@ import net.minecraft.world.dimension.DimensionType;
import java.util.List;
import java.util.function.BinaryOperator;
public class FixedCommandSource extends ServerCommandSource
public class SnoopyCommandSource extends ServerCommandSource
{
private Vec3d position;
private ServerWorld world;
@@ -35,7 +35,7 @@ public class FixedCommandSource extends ServerCommandSource
private final Value[] error;
private final List<Value> chatOutput;
public FixedCommandSource(ServerCommandSource original, Vec3d pos, Value[] error, List<Value> chatOutput)
public SnoopyCommandSource(ServerCommandSource original, Vec3d pos, Value[] error, List<Value> chatOutput)
{
super(CommandOutput.DUMMY, pos, Vec2f.ZERO, original.getWorld(), CarpetSettings.runPermissionLevel,
original.getName(), original.getDisplayName(), original.getMinecraftServer(), original.getEntity(), false,