From a7770abf9d5e0898fb0505f6318a860cffab733e Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 11 Jun 2021 00:39:40 -0300 Subject: [PATCH] better --- src/main/java/carpet/script/value/ListValue.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/carpet/script/value/ListValue.java b/src/main/java/carpet/script/value/ListValue.java index 2b0abd56..e0ab33f4 100644 --- a/src/main/java/carpet/script/value/ListValue.java +++ b/src/main/java/carpet/script/value/ListValue.java @@ -437,15 +437,9 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf public Value get(Value value) { long index = NumericValue.asNumber(value, "'address' to a list index").getLong(); - try - { - return items.get(normalizeIndex(index, items.size())); - } - catch (ArithmeticException are) - { - if (items.isEmpty()) return Value.NULL; - throw are; - } + int size = items.size(); + if (size == 0) return Value.NULL; + return items.get(normalizeIndex(index, size)); } @Override