Add store_display_names configuration1.35

2 files changed, 12 insertions, 5 deletions

diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
index 6139eac..c576687 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BedrockConnect.java
@@ -34,9 +34,11 @@ public class BedrockConnect {
     public static boolean fetchFeaturedIps = true;
 
     public static boolean fetchIps = false;
+
+    public static boolean storeDisplayNames = true;
     public static File whitelistfile;
 
-    public static String release = "1.34";
+    public static String release = "1.35";
 
     public static HashMap<String, String> featuredServerIps;
 
@@ -153,6 +155,9 @@ public class BedrockConnect {
               	if (str.startsWith("bindip=")) {
               	    bindIp = getArgValue(str, "bindip");
               	}
+                if (str.startsWith("store_display_names=")) {
+                    storeDisplayNames = getArgValue(str, "store_display_names").toLowerCase().equals("true");
+                }
             }
 
             if(!noDB)
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/sql/Data.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/sql/Data.java
index c345592..2be6ac4 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/sql/Data.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/sql/Data.java
@@ -88,9 +88,9 @@ public class Data {
                             getUser.setString(1, uuid);
                             ResultSet rs = getUser.executeQuery();
                             while (rs.next()) {
-                                if (!rs.getString("name").equals(name)) {
+                                if (BedrockConnect.storeDisplayNames && !rs.getString("name").equals(name)) {
                                     PreparedStatement updateUUID = BedrockConnect.connection.prepareStatement("UPDATE servers SET name = ? WHERE uuid = ?");
-                                    updateUUID.setString(1, uuid);
+                                    updateUUID.setString(1, name);
                                     updateUUID.setString(2, uuid);
                                     updateUUID.executeUpdate();
                                 }
@@ -116,7 +116,9 @@ public class Data {
                 if (plyrFile.createNewFile()) {
                     JSONObject jo = new JSONObject();
                     jo.put("uuid", uuid);
-                    jo.put("name", name);
+                    if(BedrockConnect.storeDisplayNames) {
+                        jo.put("name", name);
+                    }
                     jo.put("serverLimit", serverLimit);
                     jo.put("servers", new JSONArray());
 
@@ -156,7 +158,7 @@ public class Data {
                 {
                     PreparedStatement s = BedrockConnect.connection.prepareStatement("INSERT INTO servers (uuid, name, serverLimit) VALUES (?, ?, ?)");
                     s.setString(1, uuid);
-                    s.setString(2, name);
+                    s.setString(2, BedrockConnect.storeDisplayNames ? name : "");
                     s.setInt(3, Integer.parseInt(serverLimit));
                     s.executeUpdate();
                     System.out.println("[BedrockConnect] Added new user '" + name + "' (" + uuid + ") to Database.");