Merge branch 'dev/patch' into dev/feature

Author: APickledWalrus

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

@@ -20,18 +20,13 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.util.BoundingBox;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 @Name("Entities")
 @Description("All entities in all worlds, in a specific world, in a chunk, in a radius around a certain location or within two locations. " +
@@ -47,8 +42,8 @@ public class ExprEntities extends SimpleExpression<Entity> {
 
 	static {
 		Skript.registerExpression(ExprEntities.class, Entity.class, ExpressionType.PATTERN_MATCHES_EVERYTHING,
-				"[(all [[of] the]|the)] %*entitydatas% [(in|of) ([world[s]] %-worlds%|1¦%-chunks%)]",
-				"[(all [[of] the]|the)] entities of type[s] %entitydatas% [(in|of) ([world[s]] %-worlds%|1¦%-chunks%)]",
+				"[(all [[of] the]|the)] %*entitydatas% [(in|of) (world[s] %-worlds%|1:%-worlds/chunks%)]",
+				"[(all [[of] the]|the)] entities of type[s] %entitydatas% [(in|of) (world[s] %-worlds%|1:%-worlds/chunks%)]",
 				"[(all [[of] the]|the)] %*entitydatas% (within|[with]in radius) %number% [(block[s]|met(er|re)[s])] (of|around) %location%",
 				"[(all [[of] the]|the)] entities of type[s] %entitydatas% in radius %number% (of|around) %location%",
 				"[(all [[of] the]|the)] %*entitydatas% within %location% and %location%",
@@ -59,9 +54,7 @@ public class ExprEntities extends SimpleExpression<Entity> {
 	Expression<? extends EntityData<?>> types;
 
 	@UnknownNullability
-	private Expression<World> worlds;
-	@UnknownNullability
-	private Expression<Chunk> chunks;
+	private Expression<?> worldsOrChunks;
 	@UnknownNullability
 	private Expression<Number> radius;
 	@UnknownNullability
@@ -95,9 +88,9 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			to = (Expression<Location>) exprs[2];
 		} else {
 			if (parseResult.mark == 1) {
-				chunks = (Expression<Chunk>) exprs[2];
+				worldsOrChunks = exprs[2];
 			} else {
-				worlds = (Expression<World>) exprs[1];
+				worldsOrChunks = exprs[1];
 			}
 		}
 		if (types instanceof Literal && ((Literal<EntityData<?>>) types).getAll().length == 1)
@@ -137,11 +130,27 @@ public boolean isLoopOf(String s) {
 				list.add(iter.next());
 			return list.toArray((Entity[]) Array.newInstance(returnType, list.size()));
 		} else {
-			if (chunks != null) {
-				return EntityData.getAll(types.getArray(event), returnType, chunks.getArray(event));
-			} else {
-				return EntityData.getAll(types.getAll(event), returnType, worlds != null ? worlds.getArray(event) : null);
+			EntityData<?>[] types = this.types.getAll(event);
+			if (worldsOrChunks == null) {
+				return EntityData.getAll(types, returnType, (World[]) null);
+			}
+			List<Chunk> chunks = new ArrayList<>();
+			List<World> worlds = new ArrayList<>();
+			for (Object obj : worldsOrChunks.getArray(event)) {
+				if (obj instanceof Chunk chunk) {
+					chunks.add(chunk);
+				} else if (obj instanceof World world) {
+					worlds.add(world);
+				}
 			}
+			Set<Entity> entities = new HashSet<>();
+			if (!chunks.isEmpty()) {
+				entities.addAll(Arrays.asList(EntityData.getAll(types, returnType, chunks.toArray(new Chunk[0]))));
+			}
+			if (!worlds.isEmpty()) {
+				entities.addAll(Arrays.asList(EntityData.getAll(types, returnType, worlds.toArray(new World[0]))));
+			}
+			return entities.toArray((Entity[]) Array.newInstance(returnType, entities.size()));
 		}
 	}
 
@@ -197,10 +206,7 @@ public Iterator<? extends Entity> iterator(Event event) {
 				return false;
 			});
 		} else {
-			if (chunks == null || returnType == Player.class)
-				return super.iterator(event);
-
-			return Arrays.stream(EntityData.getAll(types.getArray(event), returnType, chunks.getArray(event))).iterator();
+			return super.iterator(event);
 		}
 	}
 
@@ -216,14 +222,14 @@ public Class<? extends Entity> getReturnType() {
 
 	@Override
 	@SuppressWarnings("null")
-	public String toString(@Nullable Event e, boolean debug) {
-		String message = "all entities of type " + types.toString(e, debug);
-		if (worlds != null)
-			message += " in " + worlds.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		String message = "all entities of type " + types.toString(event, debug);
+		if (worldsOrChunks != null)
+			message += " in " + worldsOrChunks.toString(event, debug);
 		else if (radius != null && center != null)
-			message += " in radius " + radius.toString(e, debug) + " around " + center.toString(e, debug);
+			message += " in radius " + radius.toString(event, debug) + " around " + center.toString(event, debug);
 		else if (from != null && to != null)
-			message += " within " + from.toString(e, debug) + " and " + to.toString(e, debug);
+			message += " within " + from.toString(event, debug) + " and " + to.toString(event, debug);
 		return message;
 	}
 

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

src/test/skript/tests/regressions/5829-entities in chunk.sk

@@ -0,0 +1,9 @@
+
+parse:
+	results: {5829::parse results}
+	code:
+		on chunk load:
+			broadcast all armor stands in event-chunk
+
+test "entities in chunk parsing":
+	assert {5829::parse results} is not set with "Failed to parse all armor stands in event-chunk"