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

Merge branch 'master' into 1.16

Browse Source 
# Conflicts:
#	docs/scarpet/Full.md
#	docs/scarpet/api/BlocksAndWorldAccess.md
This commit is contained in:
gnembon committed 2020-04-16 00:55:09 -03:00
2 parents de4c72b8b6 022addf4e1
commit bcbb197f13
4 files changed
+68 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/value/EntityValue.java
+6 -2
View File
@@ -118,7 +118,7 @@ public class EntityValue extends Value
@Override
public String getString()
{
return entity.getDisplayName().getString();
return entity.getName().getString();
}
@Override
@@ -220,7 +220,9 @@ public class EntityValue extends Value
put("motion_x", (e, a) -> new NumericValue(e.getVelocity().x));
put("motion_y", (e, a) -> new NumericValue(e.getVelocity().y));
put("motion_z", (e, a) -> new NumericValue(e.getVelocity().z));
put("name", (e, a) -> new StringValue(e.getDisplayName().getString()));
put("name", (e, a) -> new StringValue(e.getName().getString()));
put("display_name", (e, a) -> new StringValue(e.getDisplayName().getString()));
put("command_name", (e, a) -> new StringValue(e.getEntityName()));
put("custom_name", (e, a) -> e.hasCustomName()?new StringValue(e.getCustomName().getString()):Value.NULL);
put("type", (e, a) -> new StringValue(nameFromRegistryId(Registry.ENTITY_TYPE.getId(e.getType()))));
put("is_riding", (e, a) -> new NumericValue(e.hasVehicle()));
@@ -331,6 +333,8 @@ public class EntityValue extends Value
return Value.NULL;
});
put("team", (e, a) -> e.getScoreboardTeam()==null?Value.NULL:new StringValue(e.getScoreboardTeam().getName()));
put("ping", (e, a) -> {
if (e instanceof ServerPlayerEntity)
{