Merge #850 (Fullbright/X-Ray gamma fix)

Wurst-Imperium · Dec 14, 2023 · b404933 · b404933
2 parents 125ebcd + 04c51e2
commit b404933
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/net/wurstclient/hacks/FullbrightHack.java b/src/main/java/net/wurstclient/hacks/FullbrightHack.java
@@ -81,10 +81,7 @@ public void onUpdate()
 
 	private void updateGamma()
 	{
-		boolean shouldChangeGamma =
-			isEnabled() && method.getSelected() == Method.GAMMA;
-
-		if(shouldChangeGamma)
+		if(isChangingGamma())
 		{
 			setGamma(16);
 			return;
@@ -163,6 +160,11 @@ public float getNightVisionStrength()
 		return nightVisionStrength;
 	}
 
+	public boolean isChangingGamma()
+	{
+		return isEnabled() && method.getSelected() == Method.GAMMA;
+	}
+
 	/**
 	 * Returns the value of Fullbright's "Default brightness" slider. Used by
 	 * {@link XRayHack} to restore the gamma value when X-Ray is turned off.

diff --git a/src/main/java/net/wurstclient/hacks/XRayHack.java b/src/main/java/net/wurstclient/hacks/XRayHack.java
@@ -133,7 +133,7 @@ public void onDisable()
 
 		// reset gamma
 		FullbrightHack fullbright = WURST.getHax().fullbrightHack;
-		if(!fullbright.isEnabled())
+		if(!fullbright.isChangingGamma())
 			ISimpleOption.get(MC.options.getGamma())
 				.forceSetValue(fullbright.getDefaultGamma());
 	}