From 67d0383caddddfd61a7823f64d12b40d46580fb4 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sun, 12 Dec 2021 00:48:34 -0600
Subject: [PATCH] Update for Log4J exploit

---
 pom.xml                                                | 10 +++++-----
 .../me/totalfreedom/bukkittelnet/BukkitTelnet.java     |  1 +
 src/main/resources/plugin.yml                          |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a6805a..35123a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>BukkitTelnet</artifactId>
-    <version>4.6.2</version>
+    <version>4.7</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.18-R0.1-SNAPSHOT</version>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.14.1</version>
+            <version>2.15.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -112,8 +112,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
diff --git a/src/main/java/me/totalfreedom/bukkittelnet/BukkitTelnet.java b/src/main/java/me/totalfreedom/bukkittelnet/BukkitTelnet.java
index 64e439a..7f0c450 100644
--- a/src/main/java/me/totalfreedom/bukkittelnet/BukkitTelnet.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/BukkitTelnet.java
@@ -26,6 +26,7 @@ public class BukkitTelnet extends JavaPlugin
 
         TelnetLogger.setPluginLogger(plugin.getLogger());
         TelnetLogger.setServerLogger(Bukkit.getLogger());
+        System.setProperty("log4j2.formatMsgNoLookups", "true");
     }
 
     @Override
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index bb2ed3c..7d0cb86 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: BukkitTelnet
 main: me.totalfreedom.bukkittelnet.BukkitTelnet
-version: 4.6.1
-api-version: "1.13"
+version: 4.7
+api-version: "1.18"
 description: Telnet console access plugin.
 authors: [bekvon, Madgeek1450, Prozza]