From c2dfaca1b8938f6765d1e72195f980cda6a5209c Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 1 Apr 2020 13:09:02 -0300 Subject: [PATCH] added 'ping' --- docs/scarpet/Full.md | 4 ++++ docs/scarpet/api/Entities.md | 4 ++++ src/main/java/carpet/script/value/EntityValue.java | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/docs/scarpet/Full.md b/docs/scarpet/Full.md index 3a04f299..e45949d4 100644 --- a/docs/scarpet/Full.md +++ b/docs/scarpet/Full.md @@ -2502,6 +2502,10 @@ Returns `null` if the argument is not a player, otherwise: * `shadow`: any carpet-shadowed real player * `realms`: ? +### `query(e,'ping')` + +Player's ping in milliseconds, or `null` if its not a player. + ### `query(e,'permission_level')` Player's permission level, or `null` if not applicable for this entity. diff --git a/docs/scarpet/api/Entities.md b/docs/scarpet/api/Entities.md index 623fd37c..5fec0d0b 100644 --- a/docs/scarpet/api/Entities.md +++ b/docs/scarpet/api/Entities.md @@ -265,6 +265,10 @@ Returns `null` if the argument is not a player, otherwise: * `shadow`: any carpet-shadowed real player * `realms`: ? +### `query(e,'ping')` + +Player's ping in milliseconds, or `null` if its not a player. + ### `query(e,'permission_level')` Player's permission level, or `null` if not applicable for this entity. diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 4088478a..3cd5726e 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -331,6 +331,15 @@ public class EntityValue extends Value return Value.NULL; }); + put("ping", (e, a) -> { + if (e instanceof ServerPlayerEntity) + { + ServerPlayerEntity spe = (ServerPlayerEntity) e; + return new NumericValue(spe.pingMilliseconds); + } + return Value.NULL; + }); + //spectating_entity // isGlowing put("effect", (e, a) ->