diff --git a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
index 932b7ef9..1879d215 100644
--- a/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/particle/ParticleListener.java
@@ -22,7 +22,6 @@ package de.steamwar.lobby.particle;
 import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.jumpandrun.JumpAndRun;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.lobby.listener.PlayerSpawn;
 import de.steamwar.lobby.util.LobbyPlayer;
 import de.steamwar.sql.SteamwarUser;
@@ -31,6 +30,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
@@ -40,7 +40,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Linked
-public class ParticleListener extends BasicListener {
+public class ParticleListener implements Listener {
 
     private static final int PLAYER_MAX_SIZE = 20;
     private static final int SERVER_TEAM_MAX_SIZE = 40;
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
index 5b25c44e..8d324146 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggClickListener.java
@@ -1,18 +1,23 @@
 package de.steamwar.lobby.special.easter;
 
 import de.steamwar.lobby.LobbySystem;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.sql.UserConfig;
+import org.bukkit.Bukkit;
 import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.util.Vector;
 
-public class EggClickListener extends BasicListener {
+public class EggClickListener implements Listener {
+
+    public EggClickListener() {
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
+    }
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
index 92c903cf..00cb6ca1 100644
--- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
+++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java
@@ -1,15 +1,21 @@
 package de.steamwar.lobby.special.easter;
 
-import de.steamwar.lobby.listener.BasicListener;
+import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.util.ItemBuilder;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.inventory.ItemStack;
 
-public class EggHuntListener extends BasicListener {
+public class EggHuntListener implements Listener {
+
+    public EggHuntListener() {
+        Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
+    }
 
     public static final int EASTER_EGG_SLOT = 8;
     public static final ItemStack EASTER_HUNT = new ItemBuilder(Material.DRAGON_EGG, 1).setDisplayName("§fEaster Hunt").build();
diff --git a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
index eb51d1cf..db55aacb 100644
--- a/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
+++ b/LobbySystem/src/de/steamwar/lobby/team/TeamPlayer.java
@@ -22,7 +22,6 @@ package de.steamwar.lobby.team;
 import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.display.NPC;
-import de.steamwar.lobby.listener.BasicListener;
 import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
 import org.bukkit.Bukkit;
@@ -33,6 +32,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -46,7 +46,7 @@ import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 @Linked
-public class TeamPlayer extends BasicListener {
+public class TeamPlayer implements Listener {
 
     private static final List<Cuboid> cuboids = new ArrayList<>();