SteamWar/SpigotCore
SteamWar/SpigotCore
Archiviert
13
0
Fork 0
Code Issues 4 Pull-Requests 1 Releases Wiki Aktivität

Fix stuff
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2022-05-21 16:28:18 +02:00
Ursprung f8436026e2
Commit 298aa9d3de
2 geänderte Dateien mit 7 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
SpigotCore_Main/src/de/steamwar/sql/SQLProvider.java
Datei anzeigen

@ -334,7 +334,7 @@ public class SQLProvider implements Provider {
String dbLocale = rs.getString("Locale"); String dbLocale = rs.getString("Locale");
Locale locale = null; Locale locale = null;
if (dbLocale != null) { if (dbLocale != null) {
locale = new Locale(dbLocale); 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"), locale);
} }

13
SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java
Datei anzeigen

@ -42,10 +42,9 @@ public class SteamwarUser {
} }
public static void invalidate(int userId) { public static void invalidate(int userId) {
if (!byId.containsKey(userId)) SteamwarUser user = byId.remove(userId);
if (user == null)
return; return;
SteamwarUser user = byId.get(userId);
byId.remove(userId);
byName.remove(user.getUserName()); byName.remove(user.getUserName());
byUUID.remove(user.getUUID()); byUUID.remove(user.getUUID());
} }
@ -98,13 +97,11 @@ public class SteamwarUser {
public Locale getLocale() { public Locale getLocale() {
Locale locale = this.locale; Locale locale = this.locale;
if (locale == null) { if (locale == null)
locale = WorldOfColorWrapper.impl.getLocale(Bukkit.getPlayer(uuid)); locale = WorldOfColorWrapper.impl.getLocale(Bukkit.getPlayer(uuid));
} if (locale != null)
if (locale == null) {
locale = Locale.getDefault();
}
return locale; return locale;
return Locale.getDefault();
} }
public static SteamwarUser get(String userName){ public static SteamwarUser get(String userName){