Fix return value of ExprInventoryInfo (#7998)

Author: sovdeeth

src/main/java/ch/njol/skript/expressions/ExprInventoryInfo.java

@@ -1,14 +1,5 @@
 package ch.njol.skript.expressions;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -19,6 +10,16 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
 
 @Name("Inventory Holder/Viewers/Rows/Slots")
 @Description({"Gets the amount of rows/slots, viewers and holder of an inventory.",
@@ -50,41 +51,42 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
-	protected Object[] get(Event e) {
-		Inventory[] inventories = this.inventories.getArray(e);
-		List<Object> objects = new ArrayList<>();
+	protected Object[] get(Event event) {
+		Inventory[] inventories = this.inventories.getArray(event);
 		switch (type) {
 			case HOLDER:
+				List<InventoryHolder> holders = new ArrayList<>();
 				for (Inventory inventory : inventories) {
 					InventoryHolder holder = inventory.getHolder();
 					if (holder != null)
-						objects.add(holder);
+						holders.add(holder);
 				}
-				break;
+				return holders.toArray(new InventoryHolder[0]);
 			case ROWS:
+				List<Number> rows = new ArrayList<>();
 				for (Inventory inventory : inventories) {
 					int size = inventory.getSize();
 					if (size < 9) // Hoppers have a size of 5, we don't want to return 0
-						objects.add(1);
+						rows.add(1);
 					else
-						objects.add(size / 9);
+						rows.add(size / 9);
 				}
-				break;
+				return rows.toArray(new Number[0]);
 			case SLOTS:
+				List<Number> sizes = new ArrayList<>();
 				for (Inventory inventory : inventories) {
-					objects.add(inventory.getSize());
+					sizes.add(inventory.getSize());
 				}
-				break;
+				return sizes.toArray(new Number[0]);
 			case VIEWERS:
+				List<HumanEntity> viewers = new ArrayList<>();
 				for (Inventory inventory : inventories) {
-					objects.addAll(inventory.getViewers());
+					viewers.addAll(inventory.getViewers());
 				}
-				break;
+				return viewers.stream().filter(viewer -> viewer instanceof Player).toArray(Player[]::new);
 			default:
-				return new Object[0];
+				return (Object[]) Array.newInstance(getReturnType(), 0);
 		}
-		return objects.toArray(new Object[0]);
-
 	}
 
 	@Override