From 7dee43c868d59fa79ae7ac8a532c90f70475b90e Mon Sep 17 00:00:00 2001
From: zOnlyKroks <finnrades@gmail.com>
Date: Mon, 23 Jan 2023 15:40:42 +0100
Subject: [PATCH] Resolve Merge Conflicts

---
 src/de/steamwar/bungeecore/listeners/ConnectionListener.java | 2 ++
 src/de/steamwar/bungeecore/sql/Mod.java                      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/de/steamwar/bungeecore/listeners/ConnectionListener.java b/src/de/steamwar/bungeecore/listeners/ConnectionListener.java
index 5256709..a1b2e82 100644
--- a/src/de/steamwar/bungeecore/listeners/ConnectionListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ConnectionListener.java
@@ -27,6 +27,7 @@ import de.steamwar.bungeecore.bot.config.SteamwarDiscordBotConfig;
 import de.steamwar.bungeecore.bot.util.DiscordRanks;
 import de.steamwar.bungeecore.commands.ChallengeCommand;
 import de.steamwar.bungeecore.commands.CheckCommand;
+import de.steamwar.bungeecore.commands.ModCommand;
 import de.steamwar.bungeecore.commands.MsgCommand;
 import de.steamwar.bungeecore.listeners.mods.Utils;
 import de.steamwar.bungeecore.sql.SteamwarUser;
@@ -137,6 +138,7 @@ public class ConnectionListener extends BasicListener {
         ChallengeCommand.remove(e.getPlayer());
         MsgCommand.remove(e.getPlayer());
         Utils.playerModMap.remove(e.getPlayer().getUniqueId());
+        ModCommand.playerFilterType.remove(e.getPlayer());
     }
 
     @EventHandler
diff --git a/src/de/steamwar/bungeecore/sql/Mod.java b/src/de/steamwar/bungeecore/sql/Mod.java
index 391c2cd..824618c 100644
--- a/src/de/steamwar/bungeecore/sql/Mod.java
+++ b/src/de/steamwar/bungeecore/sql/Mod.java
@@ -19,6 +19,8 @@
 
 package de.steamwar.bungeecore.sql;
 
+import de.steamwar.sql.internal.Statement;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;