From 4bdc5b6bd93e7567792e8de02b5027c8bb960c98 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 12 Oct 2021 20:41:45 +0200
Subject: [PATCH] Populates default gates after migrating config to update
 default gates for old installations

---
 src/main/java/net/knarcraft/stargate/Stargate.java    | 11 ++++++++++-
 .../net/knarcraft/stargate/portal/GateHandler.java    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/knarcraft/stargate/Stargate.java b/src/main/java/net/knarcraft/stargate/Stargate.java
index 460f9c1..c9e2b60 100644
--- a/src/main/java/net/knarcraft/stargate/Stargate.java
+++ b/src/main/java/net/knarcraft/stargate/Stargate.java
@@ -381,8 +381,12 @@ public class Stargate extends JavaPlugin {
         this.reloadConfig();
         newConfig = this.getConfig();
 
-        if (newConfig.getString("lang") != null) {
+        boolean isMigrating = false;
+        if (newConfig.getString("lang") != null ||
+                newConfig.getString("gates.integrity.ignoreEntrance") != null ||
+                newConfig.getString("ignoreEntrance") != null) {
             migrateConfig(newConfig);
+            isMigrating = true;
         }
 
         // Copy default values if required
@@ -399,6 +403,11 @@ public class Stargate extends JavaPlugin {
         debuggingEnabled = newConfig.getBoolean("debugging.debug");
         permissionDebuggingEnabled = newConfig.getBoolean("debugging.permissionDebug");
 
+        //If users have an outdated config, assume they also need to update their default gates
+        if (isMigrating) {
+            GateHandler.populateDefaults(gateFolder);
+        }
+
         //Gates
         loadGateConfig();
 
diff --git a/src/main/java/net/knarcraft/stargate/portal/GateHandler.java b/src/main/java/net/knarcraft/stargate/portal/GateHandler.java
index 7139d26..8993150 100644
--- a/src/main/java/net/knarcraft/stargate/portal/GateHandler.java
+++ b/src/main/java/net/knarcraft/stargate/portal/GateHandler.java
@@ -397,7 +397,7 @@ public class GateHandler {
      *
      * @param gateFolder <p>The folder containing gate config files</p>
      */
-    private static void populateDefaults(String gateFolder) {
+    public static void populateDefaults(String gateFolder) {
         loadGateFromJar("nethergate.gate", gateFolder);
         loadGateFromJar("watergate.gate", gateFolder);
         loadGateFromJar("endgate.gate", gateFolder);