Configuration fixes

src/main/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -200,11 +200,13 @@ public class Olympiad extends ListenersContainer {
 		if (!loaded) {
 			_log.log(Level.INFO, "Failed to load data from database, trying to load from file.");
 			
-			_currentCycle = olympiad().getCurrentCycle();
-			_period = olympiad().getPeriod();
-			_olympiadEnd = olympiad().getOlympiadEnd();
-			_validationEnd = olympiad().getValidationEnd();
-			_nextWeeklyChange = olympiad().getNextWeeklyChange();
+			if (olympiad().getCurrentCycle() != null) {
+				_currentCycle = olympiad().getCurrentCycle();
+				_period = olympiad().getPeriod();
+				_olympiadEnd = olympiad().getOlympiadEnd();
+				_validationEnd = olympiad().getValidationEnd();
+				_nextWeeklyChange = olympiad().getNextWeeklyChange();
+			}
 		}
 		
 		switch (_period) {

src/main/resources/config/database.properties

@@ -20,7 +20,7 @@ Driver = org.mariadb.jdbc.Driver
 # URL = jdbc:sqlserver://localhost/database = l2jgs/user = sa/password = 
 # URL = jdbc:mariadb://localhost/l2jgs
 # Default: jdbc:mariadb://localhost/l2jgs
-URL = jdbc:mariadb://localhost:3307/l2jgs
+URL = jdbc:mariadb://localhost/l2jgs
 # Database User
 User = l2j
 # Database Password