From 451d86b5b4f0427e9b8e8836f25990476020d802 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Sat, 11 Dec 2021 17:59:41 +0100
Subject: [PATCH] Bump log4j to 2.15.0

2.14.1 and earlier (famously) contains a RCE exploit.
---
 pom.xml                              | 2 +-
 src/main/java/net/server/Server.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 577282b1a5..87cfcc94bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <mainClass>net.server.Server</mainClass>
 
-        <log4j.version>2.14.1</log4j.version>
+        <log4j.version>2.15.0</log4j.version>
         <graalvm.version>21.1.0</graalvm.version>
         <netty.version>4.1.67.Final</netty.version>
         <junit.version>5.7.2</junit.version>
diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index 3d8db6bb66..bd185c19d7 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -844,6 +844,7 @@ public class Server {
         futures.add(initExecutor.submit(() -> Quest.loadAllQuests()));
         futures.add(initExecutor.submit(() -> SkillbookInformationProvider.loadAllSkillbookInformation()));
         futures.add(initExecutor.submit(() -> PlayerNPCFactory.loadFactoryMetadata()));
+        initExecutor.shutdown();
 
         TimeZone.setDefault(TimeZone.getTimeZone(YamlConfig.config.server.TIMEZONE));