From fd9be55f7918c62fa0fc9a919c6b1aede89ab8e2 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 10 Apr 2022 18:58:34 +0200 Subject: [PATCH] Remove caching of ScaledResolution from Window shim It'll become stale if the code holds on to the Window shim object for a longer duration, and there's no reliable mechanism to invalidate it. --- .../java/com/replaymod/core/versions/Window.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/versions/1.12.2/src/main/java/com/replaymod/core/versions/Window.java b/versions/1.12.2/src/main/java/com/replaymod/core/versions/Window.java index 26d697d2..40e2278f 100644 --- a/versions/1.12.2/src/main/java/com/replaymod/core/versions/Window.java +++ b/versions/1.12.2/src/main/java/com/replaymod/core/versions/Window.java @@ -8,7 +8,6 @@ import org.lwjgl.opengl.Display; public class Window implements MainWindowAccessor { private final Minecraft mc; - private ScaledResolution scaledResolution; public Window(Minecraft mc) { this.mc = mc; @@ -52,16 +51,11 @@ public class Window implements MainWindowAccessor { } private ScaledResolution scaledResolution() { - ScaledResolution scaledResolution = this.scaledResolution; - if (scaledResolution == null) { - //#if MC>=10809 - scaledResolution = new ScaledResolution(mc); - //#else - //$$ scaledResolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - //#endif - this.scaledResolution = scaledResolution; - } - return scaledResolution; + //#if MC>=10809 + return new ScaledResolution(mc); + //#else + //$$ return new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + //#endif } public int getScaledWidth() {