From 0226f002dc4514742f8563875b4a88bc735c158e Mon Sep 17 00:00:00 2001
From: BenCheung0422 <74168521+BenCheung0422@users.noreply.github.com>
Date: Sun, 31 Dec 2023 01:55:49 +0800
Subject: [PATCH] Reduce light radius check for mob despawning

---
 .../java/minicraft/entity/mob/MobAi.java      | 20 ++++++++++++++-----
 src/client/java/minicraft/level/Level.java    |  3 ++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/client/java/minicraft/entity/mob/MobAi.java b/src/client/java/minicraft/entity/mob/MobAi.java
index 2652fedf7..813192735 100644
--- a/src/client/java/minicraft/entity/mob/MobAi.java
+++ b/src/client/java/minicraft/entity/mob/MobAi.java
@@ -2,15 +2,19 @@
 
 import minicraft.core.io.Sound;
 import minicraft.entity.Direction;
+import minicraft.entity.Entity;
 import minicraft.entity.furniture.Lantern;
 import minicraft.entity.particle.TextParticle;
 import minicraft.gfx.Color;
+import minicraft.gfx.Point;
 import minicraft.gfx.Rectangle;
 import minicraft.gfx.Screen;
 import minicraft.gfx.SpriteLinker.LinkedSprite;
 import minicraft.item.Item;
 import minicraft.item.PotionType;
 import minicraft.level.Level;
+import minicraft.level.tile.Tile;
+import minicraft.level.tile.TorchTile;
 
 import java.util.Arrays;
 
@@ -66,11 +70,17 @@ public void handleDespawn() {
 	 * @return {@code true} if the mob is within any light.
 	 */
 	protected boolean isWithinLight() {
-		return Arrays.stream(level.getEntityArray()).anyMatch(e -> e instanceof Lantern && isWithin(e.getLightRadius(), e))
-			|| !level.getMatchingTiles((tile, x, y) -> {
-			int xx = Math.abs(this.x - x), yy = Math.abs(this.y - y), l = tile.getLightRadius(level, x, y);
-			return xx * xx + yy * yy <= l * l;
-		}).isEmpty();
+		for (Entity e : level.getEntitiesInRect(e -> e instanceof Lantern, new Rectangle(x, y, 8, 8, Rectangle.CENTER_DIMS)))
+			if (e instanceof Lantern && isWithin(e.getLightRadius(), e))
+				return true;
+		for (Point p : level.getAreaTilePositions(x, y, 5)) {
+			Tile t = level.getTile(p.x, p.y);
+			int xx = Math.abs(x - p.x), yy = Math.abs(y - p.y), l = t.getLightRadius(level, p.x, p.y);
+			if (xx * xx + yy * yy <= l * l)
+				return true;
+		}
+
+		return false;
 	}
 
 	/**
diff --git a/src/client/java/minicraft/level/Level.java b/src/client/java/minicraft/level/Level.java
index d2fb45869..b681f3ec4 100644
--- a/src/client/java/minicraft/level/Level.java
+++ b/src/client/java/minicraft/level/Level.java
@@ -951,7 +951,8 @@ public boolean isLight(int x, int y) {
 			if (t instanceof TorchTile)
 				return true;
 		for (Entity e : getEntitiesInRect(e -> e instanceof Lantern, new Rectangle(x, y, 8, 8, Rectangle.CENTER_DIMS))) {
-			if (Math.hypot((e.x >> 4) - x, (e.y >> 4) - y) < e.getLightRadius() - 1)
+			int xx = (e.x >> 4) - x, yy = (e.y >> 4) - y, rr = e.getLightRadius() - 1;
+			if (xx * xx + yy * yy < rr * rr)
 				return true;
 		}