reinitialize scorehud settings if configs are updated and validate co…

…nfigs before calling can load
Ifera · May 4, 2021 · 7fa5e05 · 7fa5e05
1 parent 95b7c0c
commit 7fa5e05
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Ifera/ScoreHud/ScoreHud.php b/src/Ifera/ScoreHud/ScoreHud.php
@@ -78,12 +78,12 @@ public function onEnable(): void{
 		UpdateNotifier::checkUpdate($this->getDescription()->getName(), $this->getDescription()->getVersion());
 		ScoreHudSettings::init($this);
 
+		$this->validateConfigs();
+
 		if(!$this->canLoad()){
 			return;
 		}
 
-		$this->validateConfigs();
-
 		if(ScoreHudSettings::isTimezoneChanged()){
 			if(Utils::setTimezone()){
 				$this->getLogger()->notice("Server timezone successfully set to " . ScoreHudSettings::getTimezone());
@@ -119,13 +119,22 @@ private function loadConfigs(): void{
 	}
 
 	private function validateConfigs(): void{
+		$updated = false;
+
 		if(ConfigUpdater::checkUpdate($this, $this->getConfig(), "config-version", self::CONFIG_VERSION)){
+			$updated = true;
 			$this->reloadConfig();
 		}
 
 		if(ConfigUpdater::checkUpdate($this, $this->scoreConfig, "scorehud-version", self::SCOREHUD_VERSION)){
+			$updated = true;
 			$this->scoreConfig = new Config($this->getDataFolder() . "scorehud.yml", Config::YAML);
 		}
+
+		if($updated){
+			ScoreHudSettings::destroy();
+			ScoreHudSettings::init($this);
+		}
 	}
 
 	private function canLoad(): bool{