19w38b WIP

This commit is contained in:
gnembon committed 2019-09-18 16:25:08 -03:00
1 parent be82935455
commit 59f2c8f958
31 files changed
+93 -74

No files matched your search

@@ -400,7 +400,7 @@ public class BlockValue extends Value
}
@Override
public boolean isPlayerSneaking() {
public boolean shouldCancelInteraction() {
return sneakPlace;
}
@@ -232,7 +232,7 @@ public class EntityValue extends Value
put("home", (e, a) -> {
if (e instanceof MobEntity)
{
return (((MobEntity) e).getWalkTargetRange () > 0)?new BlockValue(null, (ServerWorld) e.getEntityWorld(), ((MobEntityWithAi) e).getWalkTarget()):Value.FALSE;
return (((MobEntity) e).getPositionTargetRange () > 0)?new BlockValue(null, (ServerWorld) e.getEntityWorld(), ((MobEntityWithAi) e).getPositionTarget()):Value.FALSE;
}
return Value.NULL;
});
@@ -640,7 +640,7 @@ public class EntityValue extends Value
throw new InternalExpressionException("home requires at least one position argument, and optional distance, or null to cancel");
if (v instanceof NullValue)
{
ec.setWalkTarget(BlockPos.ORIGIN, -1);
ec.setPositionTarget(BlockPos.ORIGIN, -1);
Map<String,Goal> tasks = ((MobEntityInterface)ec).getTemporaryTasks();
((MobEntityInterface)ec).getAI(false).remove(tasks.get("home"));
tasks.remove("home");
@@ -681,7 +681,7 @@ public class EntityValue extends Value
}
else throw new InternalExpressionException("home requires at least one position argument, and optional distance");
ec.setWalkTarget(pos, distance);
ec.setPositionTarget(pos, distance);
Map<String,Goal> tasks = ((MobEntityInterface)ec).getTemporaryTasks();
if (!tasks.containsKey("home"))
{