Fix query(e, 'brain', 'visible_mobs') returning null (gnembon#1481)

Ghoulboy78 · Jul 7, 2022 · 74f56c1 · 74f56c1
1 parent 5a4ceb6
commit 74f56c1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java
@@ -24,6 +24,7 @@
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.behavior.PositionTracker;
+import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
 import net.minecraft.world.entity.ai.memory.WalkTarget;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -49,6 +50,7 @@
 import java.util.UUID;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 public class ValueConversions
 {
@@ -267,6 +269,9 @@ private static Value fromEntityMemory(Entity e, Object v)
                     new NumericValue(((WalkTarget) v).getCloseEnoughDist())
             );
         }
+        if (v instanceof NearestVisibleLivingEntities nvle) {
+            v = StreamSupport.stream(nvle.findAll(entity -> true).spliterator(), false).toList();
+        }
         if (v instanceof Set)
         {
             v = new ArrayList(((Set) v));