Improve control flow readability

SpigotCore_Main/src/de/steamwar/sql/SQLProvider.java

@@ -332,11 +332,7 @@ public class SQLProvider implements Provider {
 
     private SteamwarUser newSteamwarUser(ResultSet rs) throws SQLException {
         String dbLocale = rs.getString("Locale");
-        Locale locale = null;
+        return new SteamwarUser(rs.getInt("id"), UUID.fromString(rs.getString("UUID")), rs.getString("UserName"), UserGroup.getUsergroup(rs.getString("UserGroup")), rs.getInt("Team"), rs.getBoolean("Bedrock"), dbLocale != null ? Locale.forLanguageTag(dbLocale) : null);
-        if (dbLocale != null) {
-            locale = Locale.forLanguageTag(dbLocale);
-        }
-        return new SteamwarUser(rs.getInt("id"), UUID.fromString(rs.getString("UUID")), rs.getString("UserName"), UserGroup.getUsergroup(rs.getString("UserGroup")), rs.getInt("Team"), rs.getBoolean("Bedrock"), locale);
     }
 
     private static final Statement insert = new Statement("INSERT INTO Exception (server, message, stacktrace) VALUES (?, ?, ?)");

SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java

@@ -55,7 +55,7 @@ public class SteamwarUser {
 	private final UserGroup userGroup;
 	private final int team;
 	private final boolean bedrock;
-	private final Locale locale;
+	private Locale locale;
 
 	public SteamwarUser(int id, UUID uuid, String userName, UserGroup userGroup, int team, boolean bedrock, Locale locale) {
 		this.id = id;
@@ -96,8 +96,8 @@ public class SteamwarUser {
 	}
 
 	public Locale getLocale() {
-		Locale locale = this.locale;
+		if(locale != null)
-		if (locale == null)
+			return locale;
 		locale = WorldOfColorWrapper.impl.getLocale(Bukkit.getPlayer(uuid));
 		if (locale != null)
 			return locale;