diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java index 551107f9a69..4d7a94de73f 100644 --- a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java +++ b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java @@ -18,6 +18,7 @@ import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.World; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; import org.jetbrains.annotations.Nullable; @@ -699,6 +700,24 @@ public OfflinePlayer[] executeSimple(Object[][] params) { .since("2.8.0, 2.9.0 (prevent lookups)"); } // end offline player function + Functions.register(DefaultFunction.builder(skript, "entity", Entity.class) + .description( + "Returns an entity from a given UUID.", + "If the entity is unloaded or an offline player, the function will return nothing." + ) + .examples( + "set {_entity} to entity({uuid})", + "kill entity({uuid})", + "set {_type} to type of entity({uuid})" + ) + .since("INSERT VERSION") + .parameter("uuid", UUID.class) + .build(args -> { + UUID uuid = args.get("uuid"); + return Bukkit.getEntity(uuid); + }) + ); + Functions.registerFunction(new SimpleJavaFunction("isNaN", numberParam, DefaultClasses.BOOLEAN, true) { @Override public Boolean[] executeSimple(Object[][] params) {