From 7b3162ece3010808d930babf7e3ec8dc8a7414a0 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 24 May 2022 09:12:43 +0200 Subject: [PATCH] Improve control flow readability --- SpigotCore_Main/src/de/steamwar/sql/SQLProvider.java | 6 +----- SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/SpigotCore_Main/src/de/steamwar/sql/SQLProvider.java b/SpigotCore_Main/src/de/steamwar/sql/SQLProvider.java index 79f2172..b1dfe51 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SQLProvider.java +++ b/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; - 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); + 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); } private static final Statement insert = new Statement("INSERT INTO Exception (server, message, stacktrace) VALUES (?, ?, ?)"); diff --git a/SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java b/SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java index 04bcbf8..d289b2a 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java +++ b/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,9 +96,9 @@ public class SteamwarUser { } public Locale getLocale() { - Locale locale = this.locale; - if (locale == null) - locale = WorldOfColorWrapper.impl.getLocale(Bukkit.getPlayer(uuid)); + if(locale != null) + return locale; + locale = WorldOfColorWrapper.impl.getLocale(Bukkit.getPlayer(uuid)); if (locale != null) return locale; return Locale.getDefault();