From d7ecefb3ffe0071605c7e3ae5a4dae07ff0caf43 Mon Sep 17 00:00:00 2001
From: Jonttuuu <50843099+Jonttuuu@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:27:07 +0300
Subject: [PATCH] Change to bungeecord playerinfo forwarding for better server
 support

---
 .../java/fi/flexplex/connect/FlexConnect.java | 63 +++----------------
 1 file changed, 10 insertions(+), 53 deletions(-)

diff --git a/src/main/java/fi/flexplex/connect/FlexConnect.java b/src/main/java/fi/flexplex/connect/FlexConnect.java
index c058b68..bd2f8ab 100644
--- a/src/main/java/fi/flexplex/connect/FlexConnect.java
+++ b/src/main/java/fi/flexplex/connect/FlexConnect.java
@@ -52,68 +52,25 @@ public final class FlexConnect extends JavaPlugin {
             configsModified = true;
         }
 
-        // Check paper config
-        boolean paperConfigModified = false;
-        final YamlConfiguration paperConfig = this.getServer().spigot().getPaperConfig();
+        // Check spigot config
+        boolean spigotConfigModified = false;
+        final YamlConfiguration spigotConfig = this.getServer().spigot().getSpigotConfig();
 
-        // Legacy paper configs (1.18 or older)
-        if (paperConfig.contains("settings.velocity-support.enabled")) {
-            if (!paperConfig.getBoolean("settings.velocity-support.enabled")) {
-                paperConfig.set("settings.velocity-support.enabled", true);
-                paperConfigModified = true;
-            }
-        }
-        if (paperConfig.contains("settings.velocity-support.online-mode")) {
-            if (!paperConfig.getBoolean("settings.velocity-support.online-mode")) {
-                paperConfig.set("settings.velocity-support.online-mode", true);
-                paperConfigModified = true;
-            }
-        }
-        if (paperConfig.contains("settings.velocity-support.secret")) {
-            if (!paperConfig.getString("settings.velocity-support.secret").equals("flexplex")) {
-                paperConfig.set("settings.velocity-support.secret", "flexplex");
-                paperConfigModified = true;
-            }
+        if (!spigotConfig.getBoolean("settings.bungeecord")) {
+            spigotConfig.set("settings.bungeecord", true);
+            spigotConfigModified = true;
         }
 
-        // Current paper configurations 1.19+
-        if (paperConfig.contains("proxies.velocity.enabled")) {
-            if (!paperConfig.getBoolean("proxies.velocity.enabled")) {
-                paperConfig.set("proxies.velocity.enabled", true);
-                paperConfigModified = true;
-            }
-        }
-        if (paperConfig.contains("proxies.velocity.online-mode")) {
-            if (!paperConfig.getBoolean("proxies.velocity.online-mode")) {
-                paperConfig.set("proxies.velocity.online-mode", true);
-                paperConfigModified = true;
-            }
-        }
-        if (paperConfig.contains("proxies.velocity.secret")) {
-            if (!paperConfig.getString("proxies.velocity.secret").equals("flexplex")) {
-                paperConfig.set("proxies.velocity.secret", "flexplex");
-                paperConfigModified = true;
-            }
-        }
-
-        // In both configurations
-        if (paperConfig.contains("settings.unsupported-settings.perform-username-validation")) {
-            if (paperConfig.getBoolean("settings.unsupported-settings.perform-username-validation")) {
-                paperConfig.set("settings.unsupported-settings.perform-username-validation", false);
-                paperConfigModified = true;
-            }
-        }
-        
-        if (paperConfigModified) {
+        if (spigotConfigModified) {
             try {
-                paperConfig.save("paper.yml");
+                spigotConfig.save("spigot.yml");
             } catch (final IOException e) {
                 e.printStackTrace();
             }
-            this.getLogger().warning("Automatic changes has been made to paper.yml config file.");
+            this.getLogger().warning("Automatic changes has been made to spigot.yml config file.");
             configsModified = true;
         }
-        
+
         // Actions if configs were modified
         if (configsModified) {
             this.getLogger().warning("Changes has been made to config files. Server will now shutdown automatically.");