Merge 9302677ad2 into 5a08031caf

2 weeks ago · ef3a41ed3d
1 changed files with 7 additions and 1 deletions
--- a/Source/items.cpp
+++ b/Source/items.cpp
@ -2540,7 +2540,13 @@ void CalcPlrLightRadius(Player &player, int lrad)
 {
 	lrad = std::clamp(lrad, 2, 15);

-	if (player._pLightRad != lrad) {
+	const bool playerOnActiveLevel = player.isOnActiveLevel();
+	const bool visionRadiusOutOfSync = playerOnActiveLevel && VisionList[player.getId()].radius != lrad;
+	const bool lightRadiusOutOfSync = playerOnActiveLevel
+	    && player.lightId != NO_LIGHT
+	    && Lights[player.lightId].radius != lrad;
+
+	if (player._pLightRad != lrad || visionRadiusOutOfSync || lightRadiusOutOfSync) {
 		ChangeLightRadius(player.lightId, lrad);
 		ChangeVisionRadius(player.getId(), lrad);
 		player._pLightRad = lrad;