Add array size check

Author: Efnilite

src/main/java/org/skriptlang/skript/bukkit/functions/BukkitFunctions.java

@@ -3,20 +3,16 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.function.Functions;
 import ch.njol.skript.util.ColorRGB;
-import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Utils;
-import ch.njol.util.Math2;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
-import org.bukkit.util.Vector;
 import org.skriptlang.skript.addon.SkriptAddon;
 import org.skriptlang.skript.common.function.DefaultFunction;
 import org.skriptlang.skript.common.function.Parameter.Modifier;
 
-import java.util.Calendar;
 import java.util.UUID;
 
 public class BukkitFunctions {
@@ -88,9 +84,9 @@ set block at location({_x}, {_y}, {_z}, {_w}) to stone
 					long exp;
 					if (level <= 0) {
 						exp = 0;
-					} else if (level >= 1 && level <= 15) {
+					} else if (level <= 15) {
 						exp = level * level + 6 * level;
-					} else if (level >= 16 && level <= 30) { // Truncating decimal parts probably works
+					} else if (level <= 30) { // Truncating decimal parts probably works
 						exp = (int) (2.5 * level * level - 40.5 * level + 360);
 					} else { // Half experience points do not exist, anyway
 						exp = (int) (4.5 * level * level - 162.5 * level + 2220);
@@ -181,8 +177,6 @@ set block at location({_x}, {_y}, {_z}, {_w}) to stone
 					result = Bukkit.getOfflinePlayer(uuid); // doesn't do lookups
 				} else if (hasIfCached && !args.getOrDefault("allowLookups", true)) {
 					result = Bukkit.getOfflinePlayerIfCached(name);
-					if (result == null)
-						return null;
 				} else {
 					result = Bukkit.getOfflinePlayer(name);
 				}

src/main/java/org/skriptlang/skript/common/elements/functions/MathFunctions.java

@@ -225,6 +225,9 @@ private static String str(double n) {
 				.parameter("ns", Number[].class)
 				.build(args -> {
 					Number[] ns = args.get("ns");
+					if (ns.length == 0)
+						return 0;
+
 					double sum = ns[0].doubleValue();
 					for (int i = 1; i < ns.length; i++)
 						sum += ns[i].doubleValue();
@@ -238,6 +241,9 @@ private static String str(double n) {
 				.parameter("ns", Number[].class)
 				.build(args -> {
 					Number[] ns = args.get("ns");
+					if (ns.length == 0)
+						return 0;
+
 					double product = ns[0].doubleValue();
 					for (int i = 1; i < ns.length; i++)
 						product *= ns[i].doubleValue();
@@ -251,6 +257,9 @@ private static String str(double n) {
 				.parameter("ns", Number[].class)
 				.build(args -> {
 					Number[] ns = args.get("ns");
+					if (ns.length == 0)
+						return 0;
+
 					double max = ns[0].doubleValue();
 					for (int i = 1; i < ns.length; i++) {
 						double d = ns[i].doubleValue();
@@ -267,6 +276,9 @@ private static String str(double n) {
 				.parameter("ns", Number[].class)
 				.build(args -> {
 					Number[] ns = args.get("ns");
+					if (ns.length == 0)
+						return 0;
+
 					double min = ns[0].doubleValue();
 					for (int i = 1; i < ns.length; i++) {
 						double d = ns[i].doubleValue();
@@ -310,7 +322,11 @@ public Class<?> getReturnType(Expression<?>... arguments) {
 					double trueMax = Math.max(min, max);
 					for (int i = 0; i < values.length; i++) {
 						double value = values[i].doubleValue();
-						clampedValues[i] = Math.clamp(value, trueMin, trueMax);
+						if (!Double.isNaN(value) && !Double.isNaN(trueMin) && !Double.isNaN(trueMax)) {
+							clampedValues[i] = Math.clamp(value, trueMin, trueMax);
+						} else {
+							clampedValues[i] = 0d;
+						}
 					}
 					return clampedValues;
 				}));

src/main/java/org/skriptlang/skript/common/elements/functions/StringFunctions.java

@@ -28,13 +28,14 @@ public class StringFunctions {
 								"A hashtag '#' represents a digit, a comma ',' is used to separate numbers, and a period '.' is used for decimals. ",
 						"Will return none if the format is invalid.",
 						"For further reference, see this <a href=\"https://docs.oracle.com/javase/7/docs/api/java/text/DecimalFormat.html\" target=\"_blank\">article</a>.")
-				.examples(
-						"command /balance:",
-						"\taliases: bal",
-						"\texecutable by: players",
-						"\ttrigger:",
-						"\t\tset {_money} to formatNumber({money::%sender's uuid%})",
-						"\t\tsend \"Your balance: %{_money}%\" to sender")
+				.examples("""
+						command /balance:
+							aliases: bal
+							executable by: players
+							trigger:
+								set {_money} to formatNumber({money::%sender's uuid%})
+								send "Your balance: %{_money}%" to sender
+						""")
 				.since("2.10")
 				.parameter("number", Number.class)
 				.parameter("format", String.class, Modifier.OPTIONAL)
@@ -71,9 +72,10 @@ public class StringFunctions {
 
 		Functions.register(DefaultFunction.builder(skript, "concat", String.class)
 				.description("Joins the provided texts (and other things) into a single text.")
-				.examples(
-						"concat(\"hello \", \"there\") # hello there",
-						"concat(\"foo \", 100, \" bar\") # foo 100 bar"
+				.examples("""
+						concat("hello ", "there") # hello there
+						concat("foo ", 100, " bar") # foo 100 bar
+						"""
 				)
 				.since("2.9.0")
 				.parameter("texts", Object[].class)

src/main/java/org/skriptlang/skript/common/elements/functions/TimeFunctions.java

@@ -18,7 +18,9 @@ public class TimeFunctions {
 		Functions.register(DefaultFunction.builder(skript, "date", Date.class)
 				.description("Creates a date from a year, month, and day, and optionally also from hour, minute, second and millisecond.",
 						"A time zone and DST offset can be specified as well (in minutes), if they are left out the server's time zone and DST offset are used (the created date will not retain this information).")
-				.examples("date(2014, 10, 1) # 0:00, 1st October 2014", "date(1990, 3, 5, 14, 30) # 14:30, 5th May 1990", "date(1999, 12, 31, 23, 59, 59, 999, -3*60, 0) # almost year 2000 in parts of Brazil (-3 hours offset, no DST)")
+				.examples("date(2014, 10, 1) # 0:00, 1st October 2014",
+						"date(1990, 3, 5, 14, 30) # 14:30, 5th May 1990",
+						"date(1999, 12, 31, 23, 59, 59, 999, -3*60, 0) # almost year 2000 in parts of Brazil (-3 hours offset, no DST)")
 				.since("2.2")
 				.parameter("year", Number.class)
 				.parameter("month", Number.class)