From b13b6ef6f5f2e26af3427c08972c228defc6e53b Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Mon, 21 Jul 2025 18:16:13 -0400
Subject: [PATCH] Adds option to disable EAR

This option is special in that:
- On new server creation, EAR will be disabled.
- For those who already have spigot.yml, EAR will be enabled.

I tried doing this without bumping the version since I know we are planning on modifying these configs...

opinion appreciated
---
 .../java/org/spigotmc/SpigotWorldConfig.java  | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/paper-server/src/main/java/org/spigotmc/SpigotWorldConfig.java b/paper-server/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 43c6240ec2..f69430ec4f 100644
--- a/paper-server/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/paper-server/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -33,11 +33,17 @@ public class SpigotWorldConfig {
         this.config.set("world-settings.default." + path, val);
     }
 
-    public boolean getBoolean(String path, boolean def) {
-        this.config.addDefault("world-settings.default." + path, def);
+    public boolean getBoolean(String path, boolean def, boolean updateDefaults) {
+        if (updateDefaults) {
+            this.config.addDefault("world-settings.default." + path, def);
+        }
         return this.config.getBoolean("world-settings." + this.worldName + "." + path, this.config.getBoolean("world-settings.default." + path));
     }
 
+    public boolean getBoolean(String path, boolean def) {
+        return this.getBoolean(path, def, true);
+    }
+
     public double getDouble(String path, double def) {
         this.config.addDefault("world-settings.default." + path, def);
         return this.config.getDouble("world-settings." + this.worldName + "." + path, this.config.getDouble("world-settings.default." + path));
@@ -73,6 +79,10 @@ public class SpigotWorldConfig {
         return this.config.get("world-settings." + this.worldName + "." + path, this.config.get("world-settings.default." + path));
     }
 
+    private boolean hasKey(String path) {
+        return this.config.get("world-settings." + this.worldName + "." + path, this.config.get("world-settings.default." + path)) != null;
+    }
+
     // Crop growth rates
     public int cactusModifier;
     public int caneModifier;
@@ -208,8 +218,27 @@ public class SpigotWorldConfig {
     public boolean villagersActiveForPanic = true;
     public boolean tickInactiveVillagers = true;
     public boolean ignoreSpectatorActivation = false;
+    public boolean enabledActivationRange = false;
 
     private void activationRange() {
+        // I dont want to create a new version as I know we are planning on migrating this soon.
+        // Unless I should anyways?
+
+        // Activation range is set
+        if (this.hasKey("entity-activation-range.enabled")) {
+            // Avoid updating the defaults, as it will cause it to override.
+            this.enabledActivationRange = this.getBoolean("entity-activation-range.enabled", false, false);
+        } else {
+            // Its not set... so we need to figure out:
+            // 1. Is this a new config? 2. Is this an old config?
+            if (this.hasKey("entity-activation-range.monsters")) { // this is a totally arbitrary key
+                // This is an old config without the enabled option, so enable it
+                this.enabledActivationRange = this.getBoolean("entity-activation-range.enabled", true);
+            } else {
+                // This is a new config option as we dont have the monsters field, so lets define it as disabled!
+                this.enabledActivationRange = this.getBoolean("entity-activation-range.enabled", false);
+            }
+        }
         boolean hasAnimalsConfig = config.getInt("entity-activation-range.animals", this.animalActivationRange) != this.animalActivationRange; // Paper
         this.animalActivationRange = this.getInt("entity-activation-range.animals", this.animalActivationRange);
         this.monsterActivationRange = this.getInt("entity-activation-range.monsters", this.monsterActivationRange);
@@ -240,7 +269,9 @@ public class SpigotWorldConfig {
         this.villagersActiveForPanic = this.getBoolean("entity-activation-range.villagers-active-for-panic", this.villagersActiveForPanic);
         this.tickInactiveVillagers = this.getBoolean("entity-activation-range.tick-inactive-villagers", this.tickInactiveVillagers);
         this.ignoreSpectatorActivation = this.getBoolean("entity-activation-range.ignore-spectators", this.ignoreSpectatorActivation);
-        this.log("Entity Activation Range: An " + this.animalActivationRange + " / Mo " + this.monsterActivationRange + " / Ra " + this.raiderActivationRange + " / Mi " + this.miscActivationRange + " / Tiv " + this.tickInactiveVillagers + " / Isa " + this.ignoreSpectatorActivation);
+        if (this.enabledActivationRange) {
+            this.log("Entity Activation Range: An " + this.animalActivationRange + " / Mo " + this.monsterActivationRange + " / Ra " + this.raiderActivationRange + " / Mi " + this.miscActivationRange + " / Tiv " + this.tickInactiveVillagers + " / Isa " + this.ignoreSpectatorActivation);
+        }
     }
 
     public int playerTrackingRange = 128;