Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/be/jaud/Main.java
This commit is contained in:
genuineparts 2025-06-26 20:04:10 +02:00
commit 8949a1ada7
2 changed files with 3 additions and 2 deletions

View file

@ -17,7 +17,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
public class Main {
private static final String version = "0.8.1";
private static final String version = "0.9";
private static final HashMap<String, HashMap<String, Integer>> udata = new HashMap<>();
public static Settings conf;
static OebbCheck check = new OebbCheck();
@ -71,6 +71,7 @@ public class Main {
ResultSet rs = MariaDB.load_users();
if (rs != null) {
while (rs.next()) {
HashMap<String, Integer> data = new HashMap<>();
String user = rs.getString("user");
ResultSet rsu = MariaDB.load_user(user);
if (rsu != null) {