Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
This commit is contained in:
gnembon committed 2021-04-17 01:37:40 -03:00
commit 8f2c935fe6
6 files changed
+96 -98

No files matched your search

@@ -37,7 +37,7 @@ public class FixedCommandSource extends ServerCommandSource
public FixedCommandSource(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(), true,
original.getName(), original.getDisplayName(), original.getMinecraftServer(), original.getEntity(), false,
(ctx, succ, res) -> { }, EntityAnchorArgumentType.EntityAnchor.FEET);
position = pos;
world = original.getWorld();
@@ -80,11 +80,9 @@ public class FixedCommandSource extends ServerCommandSource
return this;
}
@Override
public ServerCommandSource withSilent()
{
return this;
}
//@Override // only used in fuctions and we really don't care to track these actually, besides the basic output
// also other overrides target ONLY execute command, which withSilent doesn't care bout.
//public ServerCommandSource withSilent() { return this; }
@Override
public ServerCommandSource withLevel(int level)