From 445dc487b9cc81b1ec5ade554846ec38e4405b15 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sun, 26 Apr 2026 18:56:08 +0200 Subject: [PATCH] fix world client leak caused by lambda in IrisExclusiveUniforms$WorldInfoUniforms (#1701) --- .../net/coderbot/iris/uniforms/IrisExclusiveUniforms.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java b/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java index 6c5ede25a..c7be0d01a 100644 --- a/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java @@ -128,9 +128,9 @@ public class IrisExclusiveUniforms { public static class WorldInfoUniforms { public static void addWorldInfoUniforms(UniformHolder uniforms) { - final WorldClient level = Minecraft.getMinecraft().theWorld; uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "bedrockLevel", () -> 0); uniforms.uniform1f(UniformUpdateFrequency.PER_FRAME, "cloudHeight", () -> { + final WorldClient level = Minecraft.getMinecraft().theWorld; if (level != null && level.provider != null) { return level.provider.getCloudHeight(); } else { @@ -138,6 +138,7 @@ public class IrisExclusiveUniforms { } }); uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "heightLimit", () -> { + final WorldClient level = Minecraft.getMinecraft().theWorld; if (level != null && level.provider != null) { return level.provider.getHeight(); } else { @@ -145,6 +146,7 @@ public class IrisExclusiveUniforms { } }); uniforms.uniform1b(UniformUpdateFrequency.PER_FRAME, "hasCeiling", () -> { + final WorldClient level = Minecraft.getMinecraft().theWorld; if (level != null && level.provider != null) { return level.provider.hasNoSky; } else { @@ -152,6 +154,7 @@ public class IrisExclusiveUniforms { } }); uniforms.uniform1b(UniformUpdateFrequency.PER_FRAME, "hasSkylight", () -> { + final WorldClient level = Minecraft.getMinecraft().theWorld; if (level != null && level.provider != null) { return !level.provider.hasNoSky; } else { @@ -159,6 +162,7 @@ public class IrisExclusiveUniforms { } }); uniforms.uniform1f(UniformUpdateFrequency.PER_FRAME, "ambientLight", () -> { + final WorldClient level = Minecraft.getMinecraft().theWorld; if (level != null && level.provider != null) { return level.provider.lightBrightnessTable[0]; } else {