Merge Fixes 0.16.1

fluddokt · Jun 11, 2018 · 1e8ef3f · 1e8ef3f
1 parent 6b9ca55
commit 1e8ef3f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/fluddokt/opsu/fake/GameOpsu.java b/src/fluddokt/opsu/fake/GameOpsu.java
@@ -25,7 +25,7 @@
 
 public class GameOpsu extends com.badlogic.gdx.Game {
 
-	public final static String VERSION = "0.16.0b";
+	public final static String VERSION = "0.16.1a";
 	public StateBasedGame sbg;
 
 	Stage stage;

diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
@@ -1539,14 +1539,6 @@ public void sendSpinnerSpinResult(int result) {
 			return;
 		}
 
-		score += hitValue;
-		health.changeHealthForHit(result);
-	}
-			break;
-		default:
-			return;
-		}
-
 		score += hitValue;
 		health.changeHealthForHit(result);
 	}

diff --git a/src/itdelatrisu/opsu/Utils.java b/src/itdelatrisu/opsu/Utils.java
@@ -554,7 +554,7 @@ public static String readDataFromUrl(URL url) throws IOException {
 		conn.setConnectTimeout(Download.CONNECTION_TIMEOUT);
 		conn.setReadTimeout(Download.READ_TIMEOUT);
 		conn.setUseCaches(false);
-		conn.setRequestProperty("User-Agent", "Mozilla/5.0...");
+		conn.setRequestProperty("User-Agent", Options.USER_AGENT);
 		try {
 			conn.connect();
 		} catch (SocketTimeoutException e) {
@@ -842,9 +842,11 @@ public static void copyToClipboard(String text) {
 	}
 
 	/** Sets the execute permission for the given file. */
+	/*
 	public static void setExecutable(File file) {
 		if (!Files.isExecutable(file.toPath())) {
 			file.setExecutable(true);
 		}
 	}
+	*/
 }
diff --git a/src/itdelatrisu/opsu/options/Options.java b/src/itdelatrisu/opsu/options/Options.java
@@ -445,9 +445,9 @@ public void selectItem(int index, GameContainer container) {
 				int fps = getTargetFPS();
 				boolean vsync = (fps == 60);
 				container.setTargetFrameRate(fps);
-				if (container.isVSyncRequested() != vsync) {
+				//if (container.isVSyncRequested() != vsync) {
 					container.setVSync(vsync);
-				}
+				//}
 			}
 
 			@Override