From d2dbe2dd7238ed0a0c75f30a875e26fc958c84a4 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sat, 15 Mar 2025 18:10:13 +0100
Subject: [PATCH] Cleanup

---
 system/src/Services/DatabaseService.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/system/src/Services/DatabaseService.php b/system/src/Services/DatabaseService.php
index 9aa70d49..3e8b2ec1 100644
--- a/system/src/Services/DatabaseService.php
+++ b/system/src/Services/DatabaseService.php
@@ -19,13 +19,15 @@ class DatabaseService
 
 	public function connect(): void
 	{
-		global $config;
+		$configDatabaseOverwrite = config('database_overwrite');
 
-		if (!isset($config['database_overwrite'])) {
-			$config['database_overwrite'] = false;
+		if (!isset($configDatabaseOverwrite)) {
+			$configDatabaseOverwrite = false;
+			config(['database_overwrite', false]);
 		}
 
-		if(!$config['database_overwrite'] && !isset($config['database_user'][0], $config['database_password'][0], $config['database_name'][0])) {
+		global $config;
+		if(!$configDatabaseOverwrite) {
 			if(isset($config['lua']['sqlType'])) {// tfs 0.3
 				if(isset($config['lua']['mysqlHost'])) {// tfs 0.2
 					$config['otserv_version'] = TFS_02;
@@ -103,7 +105,6 @@ class DatabaseService
 		}
 
 		$ots = \POT::getInstance();
-		$cache = app()->get('cache');
 
 		try {
 			$ots->connect([
@@ -133,7 +134,8 @@ class DatabaseService
 
 			$eloquentConnection = $capsule->getConnection();
 		} catch (\Exception $e) {
-			if(isset($cache) && $cache->enabled()) {
+			$cache = app()->get('cache');
+			if($cache->enabled()) {
 				$cache->delete('config_lua');
 			}