Merge pull request #29 from RedstoneFuture/Fixes/EventListener

Reworking EventListener v.1

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -472,6 +472,15 @@ public class Game {
 
     }
 
+    /**
+     * This method respawns the player after short time.
+     *
+     * @param player the target player
+     */
+    public static void autoRespawnPlayer(Player player) {
+        Bukkit.getScheduler().runTaskLater(MissileWars.getInstance(), () -> player.spigot().respawn(), 20L);
+    }
+
     public void setArena(Arena arena) {
         Preconditions.checkNotNull(arena);
         if (this.arena != null) {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/EndListener.java

@@ -44,11 +44,11 @@ public class EndListener extends GameBoundListener {
 
     @SuppressWarnings("deprecation")
     @EventHandler
-    public void onJoin(PlayerArenaJoinEvent e) {
-        Game game = e.getGame();
+    public void onJoin(PlayerArenaJoinEvent event) {
+        Game game = event.getGame();
         if (game != getGame()) return;
 
-        Player p = e.getPlayer();
+        Player p = event.getPlayer();
         PlayerDataProvider.getInstance().storeInventory(p);
         p.sendMessage(MessageConfig.getMessage("spectator"));
 
@@ -59,31 +59,30 @@ public class EndListener extends GameBoundListener {
         game.addPlayer(p);
     }
 
-    @EventHandler(priority = EventPriority.LOW)
-    public void onRespawn(PlayerRespawnEvent e) {
-        if (isInLobbyArea(e.getRespawnLocation())) {
-            e.setRespawnLocation(getGame().getArena().getSpectatorSpawn());
-        }
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onRespawn(PlayerRespawnEvent event) {
+        if (!isInGameWorld(event.getPlayer().getLocation())) return;
+
+        event.setRespawnLocation(getGame().getArena().getSpectatorSpawn());
     }
 
-    @SuppressWarnings("deprecation")
-    @EventHandler
-    public void onDeath(PlayerDeathEvent e) {
-        if (!isInLobbyArea(e.getEntity().getLocation())) return;
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onDeath(PlayerDeathEvent event) {
+        if (!isInGameWorld(event.getEntity().getLocation())) return;
+
+        Player player = event.getEntity();
 
-        Player p = e.getEntity();
-        p.setHealth(p.getMaxHealth());
-        p.teleport(getGame().getArena().getSpectatorSpawn());
-        e.setDeathMessage(null);
+        event.setDeathMessage(null);
+        if (getGame().getArena().isAutoRespawn()) getGame().autoRespawnPlayer(player);
     }
 
     @EventHandler
-    public void onClick(InventoryClickEvent e) {
-        if (!(e.getWhoClicked() instanceof Player)) return;
+    public void onClick(InventoryClickEvent event) {
+        if (!(event.getWhoClicked() instanceof Player)) return;
 
-        Player p = (Player) e.getWhoClicked();
+        Player p = (Player) event.getWhoClicked();
         if (isInGameWorld(p.getLocation()))
             if (p.getGameMode() != GameMode.CREATIVE && !p.isOp())
-                e.setCancelled(true);
+                event.setCancelled(true);
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/GameListener.java

@@ -66,34 +66,34 @@ public class GameListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onMove(PlayerMoveEvent e) {
-        if (!isInGameWorld(e.getTo())) return;
+    public void onMove(PlayerMoveEvent event) {
+        if (!isInGameWorld(event.getTo())) return;
 
-        Player p = e.getPlayer();
-        if ((e.getTo().getBlockY() >= getGame().getArena().getMaxHeight()) && (p.getGameMode() == GameMode.SURVIVAL)) {
-            p.teleport(e.getFrom());
+        Player p = event.getPlayer();
+        if ((event.getTo().getBlockY() >= getGame().getArena().getMaxHeight()) && (p.getGameMode() == GameMode.SURVIVAL)) {
+            p.teleport(event.getFrom());
             p.sendMessage(MessageConfig.getMessage("not_higher"));
-        } else if ((e.getTo().getBlockY() <= getGame().getArena().getDeathHeight()) && (p.getGameMode() == GameMode.SURVIVAL)) {
+        } else if ((event.getTo().getBlockY() <= getGame().getArena().getDeathHeight()) && (p.getGameMode() == GameMode.SURVIVAL)) {
             p.setLastDamageCause(new EntityDamageEvent(p, EntityDamageEvent.DamageCause.FALL, 20));
             p.damage(20.0D);
         }
-        if (!getGame().isInGameArea(e.getTo())) {
-            e.setCancelled(true);
-            Vector addTo = e.getFrom().toVector().subtract(e.getTo().toVector()).multiply(3);
+        if (!getGame().isInGameArea(event.getTo())) {
+            event.setCancelled(true);
+            Vector addTo = event.getFrom().toVector().subtract(event.getTo().toVector()).multiply(3);
             addTo.setY(0);
-            p.teleport(e.getFrom().add(addTo));
+            p.teleport(event.getFrom().add(addTo));
             p.sendMessage(MessageConfig.getMessage("arena_leave"));
         }
     }
 
     @EventHandler
-    public void onExplode(EntityExplodeEvent e) {
-        if (!isInGameWorld(e.getLocation())) return;
+    public void onExplode(EntityExplodeEvent event) {
+        if (!isInGameWorld(event.getLocation())) return;
 
         Game game = getGame();
 
-        if (e.getEntity().getType() == EntityType.FIREBALL && !game.getArena().getFireballConfiguration().isDestroysPortal())
-            e.blockList().removeIf(b -> b.getType() == VersionUtil.getPortal());
+        if (event.getEntity().getType() == EntityType.FIREBALL && !game.getArena().getFireballConfiguration().isDestroysPortal())
+            event.blockList().removeIf(b -> b.getType() == VersionUtil.getPortal());
     }
 
     @EventHandler
@@ -115,23 +115,23 @@ public class GameListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onInteract(PlayerInteractEvent e) {
-        if (!isInGameWorld(e.getPlayer().getLocation())) return;
-        if (e.getItem() == null) return;
-        if (e.getAction() != Action.RIGHT_CLICK_AIR && e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
+    public void onInteract(PlayerInteractEvent event) {
+        if (!isInGameWorld(event.getPlayer().getLocation())) return;
+        if (event.getItem() == null) return;
+        if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
 
-        Player player = e.getPlayer();
-        ItemStack itemStack = e.getItem();
+        Player player = event.getPlayer();
+        ItemStack itemStack = event.getItem();
         Game game = getGame();
 
         // missile spawn with using of a missile spawn egg
         if (VersionUtil.isMonsterEgg(itemStack.getType())) {
-            e.setCancelled(true);
+            event.setCancelled(true);
 
             // Can missiles only be spawned if the item interaction was performed on a block (no air)?
             boolean isOnlyBlockPlaceable = game.getArena().getMissileConfiguration().isOnlyBlockPlaceable();
             if (isOnlyBlockPlaceable) {
-                if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
+                if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
             }
 
             // Are missiles only allowed to spawn inside the arena, between the two arena spawn points?
@@ -157,8 +157,8 @@ public class GameListener extends GameBoundListener {
 
         // shield spawn with using of a missile spawn egg
         if (itemStack.getType() == VersionUtil.getFireball()) {
-            int amount = e.getItem().getAmount();
-            e.getItem().setAmount(amount - 1);
+            int amount = event.getItem().getAmount();
+            event.getItem().setAmount(amount - 1);
 
             if (amount == 1 && VersionUtil.getVersion() == 8) {
                 player.getInventory().remove(VersionUtil.getFireball());
@@ -176,11 +176,11 @@ public class GameListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onJoin(PlayerArenaJoinEvent e) {
-        Game game = e.getGame();
+    public void onJoin(PlayerArenaJoinEvent event) {
+        Game game = event.getGame();
         if (game != getGame()) return;
 
-        Player p = e.getPlayer();
+        Player p = event.getPlayer();
         MWPlayer mwPlayer = game.addPlayer(p);
         PlayerDataProvider.getInstance().storeInventory(p);
         p.getInventory().clear();
@@ -209,110 +209,98 @@ public class GameListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onThrow(ProjectileLaunchEvent e) {
-        if (!isInGameWorld(e.getEntity().getLocation())) return;
+    public void onThrow(ProjectileLaunchEvent event) {
+        if (!isInGameWorld(event.getEntity().getLocation())) return;
 
         Game game = getGame();
-        if (e.getEntity() instanceof Snowball) {
-            Snowball ball = (Snowball) e.getEntity();
+        if (event.getEntity() instanceof Snowball) {
+            Snowball ball = (Snowball) event.getEntity();
             if (ball.getShooter() instanceof Player) {
                 Shield shield = new Shield((Player) ball.getShooter(), game.getArena().getShieldConfiguration());
-                shield.onThrow(e);
+                shield.onThrow(event);
             }
         }
     }
 
     @EventHandler
-    public void onDamage(EntityDamageByEntityEvent e) {
-        if (!isInGameWorld(e.getEntity().getLocation())) return;
-        if (!(e.getEntity() instanceof Player)) return;
+    public void onDamage(EntityDamageByEntityEvent event) {
+        if (!isInGameWorld(event.getEntity().getLocation())) return;
+        if (!(event.getEntity() instanceof Player)) return;
       
-        Player p = (Player) e.getEntity();
-        if (e.getDamager() instanceof Projectile) {
-            Projectile pj = (Projectile) e.getDamager();
+        Player p = (Player) event.getEntity();
+        if (event.getDamager() instanceof Projectile) {
+            Projectile pj = (Projectile) event.getDamager();
             Player shooter = (Player) pj.getShooter();
             if (Objects.requireNonNull(getGame().getPlayer(shooter)).getTeam() == Objects.requireNonNull(getGame().getPlayer(p)).getTeam()) {
                 shooter.sendMessage(MessageConfig.getMessage("hurt_teammates"));
-                e.setCancelled(true);
+                event.setCancelled(true);
             }
             return;
         }
-        if (e.getDamager() instanceof Player) {
-            Player d = (Player) e.getDamager();
+        if (event.getDamager() instanceof Player) {
+            Player d = (Player) event.getDamager();
             if (Objects.requireNonNull(getGame().getPlayer(d)).getTeam() == Objects.requireNonNull(getGame().getPlayer(p)).getTeam()) {
                 d.sendMessage(MessageConfig.getMessage("hurt_teammates"));
-                e.setCancelled(true);
+                event.setCancelled(true);
             }
         }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
-    public void onRespawn(PlayerRespawnEvent e) {
-        if (!isInGameWorld(e.getPlayer().getLocation())) return;
+    public void onRespawn(PlayerRespawnEvent event) {
+        if (!isInGameWorld(event.getPlayer().getLocation())) return;
 
-        Game game = getGame();
-        Player player = e.getPlayer();
+        Player player = event.getPlayer();
+        Team team = getGame().getPlayer(player).getTeam();
+
+        if (team != null) {
+            event.setRespawnLocation(team.getSpawn());
+            getGame().sendGameItems(player, true);
+            getGame().setPlayerAttributes(player);
 
-        Team t = Objects.requireNonNull(getGame().getPlayer(player)).getTeam();
-        if (t != null) {
-            e.setRespawnLocation(t.getSpawn());
             FallProtectionConfiguration fallProtection = getGame().getArena().getFallProtection();
-            if (fallProtection.isEnabled())
+            if (fallProtection.isEnabled()) {
                 new RespawnGoldBlock(player, fallProtection.getDuration(), fallProtection.isMessageOnlyOnStart(), getGame());
+            }
         } else {
-            e.setRespawnLocation(getGame().getArena().getSpectatorSpawn());
+            event.setRespawnLocation(getGame().getArena().getSpectatorSpawn());
         }
-
-        game.sendGameItems(player, true);
-        game.setPlayerAttributes(player);
     }
 
-    @EventHandler
-    public void onDeath(PlayerDeathEvent e) {
-
-        // check if the player is in a game world
-        if (!isInGameWorld(e.getEntity().getLocation())) return;
-
-        Game game = getGame();
-        Player p = e.getEntity();
-
-        e.setDeathMessage(null);
-        // delete vanilla death message
-        String deathBroadcastMessage = null;
-
-        MWPlayer player = getGame().getPlayer(p);
-        assert player != null;
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onDeath(PlayerDeathEvent event) {
+        if (!isInGameWorld(event.getEntity().getLocation())) return;
 
-        if (game.getArena().isAutoRespawn()) Bukkit.getScheduler().runTaskLater(MissileWars.getInstance(), () -> p.spigot().respawn(), 20L);
-
-        // spectator respawn for people there are not in a team
-        if (player.getTeam() == null) {
-            p.setHealth(p.getMaxHealth());
-            p.teleport(getGame().getArena().getSpectatorSpawn());
-            return;
-        }
+        Player player = event.getEntity();
+        Team team = getGame().getPlayer(player).getTeam();
 
         // check the death cause for choice the death message
-        if (p.getLastDamageCause() != null) {
+        if (team != null) {
 
-            EntityDamageEvent.DamageCause damageCause = p.getLastDamageCause().getCause();
+            if (player.getLastDamageCause() == null) return;
+
+            String deathBroadcastMessage;
+            EntityDamageEvent.DamageCause damageCause = player.getLastDamageCause().getCause();
 
             if (damageCause == EntityDamageEvent.DamageCause.BLOCK_EXPLOSION || damageCause == EntityDamageEvent.DamageCause.ENTITY_EXPLOSION) {
-                deathBroadcastMessage = MessageConfig.getNativeMessage("died_explosion").replace("%player%", p.getDisplayName());
+                deathBroadcastMessage = MessageConfig.getNativeMessage("died_explosion").replace("%player%", player.getDisplayName());
             } else {
-                deathBroadcastMessage = MessageConfig.getNativeMessage("died").replace("%player%", p.getDisplayName());
+                deathBroadcastMessage = MessageConfig.getNativeMessage("died").replace("%player%", player.getDisplayName());
             }
+
+            getGame().broadcast(deathBroadcastMessage);
         }
 
-        getGame().broadcast(deathBroadcastMessage);
+        event.setDeathMessage(null);
+        if (getGame().getArena().isAutoRespawn()) getGame().autoRespawnPlayer(player);
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onLeave(PlayerArenaLeaveEvent e) {
-        Game game = e.getGame();
+    public void onLeave(PlayerArenaLeaveEvent event) {
+        Game game = event.getGame();
         if (game != getGame()) return;
 
-        MWPlayer player = getGame().getPlayer(e.getPlayer());
+        MWPlayer player = getGame().getPlayer(event.getPlayer());
         if (player == null) return;
         BukkitTask task = game.getPlayerTasks().get(player.getUuid());
         if (task != null) task.cancel();
@@ -320,8 +308,8 @@ public class GameListener extends GameBoundListener {
         Team team = player.getTeam();
         if (team != null) {
             getGame().broadcast(
-                    MessageConfig.getMessage("player_left").replace("%player%", e.getPlayer().getDisplayName()));
-            team.removeMember(getGame().getPlayer(e.getPlayer()));
+                    MessageConfig.getMessage("player_left").replace("%player%", event.getPlayer().getDisplayName()));
+            team.removeMember(getGame().getPlayer(event.getPlayer()));
 
             int teamSize = team.getMembers().size();
             if (teamSize == 0) {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/LobbyListener.java

@@ -35,6 +35,7 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -51,15 +52,15 @@ public class LobbyListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onInteract(PlayerInteractEvent e) {
-        if (!isInLobbyArea(e.getPlayer().getLocation())) return;
+    public void onInteract(PlayerInteractEvent event) {
+        if (!isInLobbyArea(event.getPlayer().getLocation())) return;
 
-        Player p = e.getPlayer();
+        Player p = event.getPlayer();
         if (p.getGameMode() == GameMode.CREATIVE) return;
-        e.setCancelled(true);
-        if (e.getItem() == null) return;
+        event.setCancelled(true);
+        if (event.getItem() == null) return;
 
-        if (VersionUtil.isStainedGlassPane(e.getItem().getType())) {
+        if (VersionUtil.isStainedGlassPane(event.getItem().getType())) {
 
             if (!p.hasPermission("mw.change")) return;
 
@@ -68,7 +69,7 @@ public class LobbyListener extends GameBoundListener {
                 return;
             }
 
-            String displayName = e.getItem().getItemMeta().getDisplayName();
+            String displayName = event.getItem().getItemMeta().getDisplayName();
             if (displayName.equals(getGame().getTeam1().getFullname())) {
                 p.performCommand("mw change 1");
                 getGame().getScoreboardManager().updateScoreboard();
@@ -77,7 +78,7 @@ public class LobbyListener extends GameBoundListener {
                 getGame().getScoreboardManager().updateScoreboard();
             }
 
-        } else if (e.getItem().getType() == Material.NETHER_STAR) {
+        } else if (event.getItem().getType() == Material.NETHER_STAR) {
             VoteInventory inventory = new VoteInventory(getGame().getLobby().getArenas());
             p.openInventory(inventory.getInventory(p));
         }
@@ -85,11 +86,11 @@ public class LobbyListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onJoin(PlayerArenaJoinEvent e) {
-        Game game = e.getGame();
+    public void onJoin(PlayerArenaJoinEvent event) {
+        Game game = event.getGame();
         if (game != getGame()) return;
 
-        Player p = e.getPlayer();
+        Player p = event.getPlayer();
         MWPlayer mw = game.addPlayer(p);
 
         PlayerDataProvider.getInstance().storeInventory(p);
@@ -137,26 +138,26 @@ public class LobbyListener extends GameBoundListener {
     }
 
     @EventHandler
-    public void onDamage(EntityDamageEvent e) {
-        if (isInLobbyArea(e.getEntity().getLocation())) {
-            e.setCancelled(true);
-        }
+    public void onDamage(EntityDamageEvent event) {
+        if (!isInLobbyArea(event.getEntity().getLocation())) return;
+
+        event.setCancelled(true);
     }
 
-    @EventHandler
-    public void onRespawn(PlayerRespawnEvent e) {
-        if (isInLobbyArea(e.getPlayer().getLocation())) {
-            e.setRespawnLocation(getGame().getLobby().getSpawnPoint());
-        }
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onRespawn(PlayerRespawnEvent event) {
+        if (!isInLobbyArea(event.getPlayer().getLocation())) return;
+
+        event.setRespawnLocation(getGame().getLobby().getSpawnPoint());
     }
 
     @EventHandler
-    public void onInventoryClick(InventoryClickEvent e) {
-        if (!(e.getWhoClicked() instanceof Player)) return;
+    public void onInventoryClick(InventoryClickEvent event) {
+        if (!(event.getWhoClicked() instanceof Player)) return;
+
+        Player p = (Player) event.getWhoClicked();
+        if (!isInLobbyArea(p.getLocation())) return;
 
-        Player p = (Player) e.getWhoClicked();
-        if (isInLobbyArea(p.getLocation()))
-            if (p.getGameMode() != GameMode.CREATIVE && !p.isOp())
-                e.setCancelled(true);
+        if (p.getGameMode() != GameMode.CREATIVE) event.setCancelled(true);
     }
 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/PlayerListener.java

@@ -62,36 +62,40 @@ public class PlayerListener implements Listener {
     }
 
     @EventHandler
-    public void onFoodLevelChange(FoodLevelChangeEvent e) {
-        Game game = getGame(e.getEntity().getLocation());
-        if (game != null)
-            e.setCancelled(true);
+    public void onFoodLevelChange(FoodLevelChangeEvent event) {
+        Game game = getGame(event.getEntity().getLocation());
+        if (game == null) return;
+
+        event.setCancelled(true);
     }
 
     @EventHandler
-    public void onBlockPlace(BlockPlaceEvent e) {
-        Game game = getGame(e.getPlayer().getLocation());
-        if (game != null && e.getPlayer().getGameMode() != GameMode.CREATIVE)
-            e.setBuild(false);
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Game game = getGame(event.getPlayer().getLocation());
+        if (game == null) return;
+
+        if (event.getPlayer().getGameMode() != GameMode.CREATIVE) event.setBuild(false);
     }
 
     @EventHandler
-    public void onDrop(PlayerDropItemEvent e) {
-        Game game = getGame(e.getPlayer().getLocation());
-        if (game != null)
-            e.setCancelled(true);
+    public void onDrop(PlayerDropItemEvent event) {
+        Game game = getGame(event.getPlayer().getLocation());
+        if (game == null) return;
+
+        event.setCancelled(true);
     }
 
     @EventHandler
-    public void onPickup(PlayerPickupItemEvent e) {
-        Game game = getGame(e.getPlayer().getLocation());
-        if (game != null)
-            e.setCancelled(true);
+    public void onPickup(PlayerPickupItemEvent event) {
+        Game game = getGame(event.getPlayer().getLocation());
+        if (game == null) return;
+
+        event.setCancelled(true);
     }
 
     @EventHandler
-    public void onQuit(PlayerQuitEvent e) {
-        Player p = e.getPlayer();
+    public void onQuit(PlayerQuitEvent event) {
+        Player p = event.getPlayer();
 
         Game game = getGame(p.getLocation());
         if (game != null) {
@@ -153,6 +157,34 @@ public class PlayerListener implements Listener {
         MissileWars.getInstance().getSignRepository().getSigns(game).forEach(MWSign::update);
     }
 
+    // cancel anvil interaction to block renaming, and thus changing missiles
+    @EventHandler
+    public void onClick(InventoryClickEvent event) {
+        Game game = getGame(event.getWhoClicked().getLocation());
+        if (game != null) {
+            if (event.getInventory().getType() == InventoryType.ANVIL) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    // Internal stuff
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onMaxPlayers(PrePlayerArenaJoinEvent event) {
+        if (event.getGame().getPlayers().size() >= event.getGame().getLobby().getMaxSize() && event.getGame().getState() == GameState.LOBBY)
+            event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPreJoin(PrePlayerArenaJoinEvent event) {
+        Logger.DEBUG.log("PrePlayerArenaJoinEvent: " + event.getPlayer().getName());
+        Bukkit.getScheduler().runTask(MissileWars.getInstance(), () -> Bukkit.getPluginManager()
+                .callEvent(new PlayerArenaJoinEvent(event.getPlayer(), event.getGame())));
+    }
+
+    // Debugging staff
+
     @EventHandler
     public void onPlayerArenaJoin(PlayerArenaJoinEvent event) {
         Logger.DEBUG.log("PlayerArenaJoinEvent: " + event.getPlayer().getName());
@@ -171,12 +203,6 @@ public class PlayerListener implements Listener {
 
     /**
      * Checks if cancelled and spits out events
-     *
-     * @param player
-     * @param from
-     * @param to
-     *
-     * @return
      */
     private boolean checkJoinOrLeave(Player player, Game from, Game to) {
         if (to != null && to != from) {
@@ -192,28 +218,4 @@ public class PlayerListener implements Listener {
         return false;
     }
 
-    // cancel anvil interaction to block renaming, and thus changing missiles
-    @EventHandler
-    public void onClick(InventoryClickEvent event) {
-        Game game = getGame(event.getWhoClicked().getLocation());
-        if (game != null) {
-            if (event.getInventory().getType() == InventoryType.ANVIL) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    // Internal stuff
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onMaxPlayers(PrePlayerArenaJoinEvent event) {
-        if (event.getGame().getPlayers().size() >= event.getGame().getLobby().getMaxSize() && event.getGame().getState() == GameState.LOBBY)
-            event.setCancelled(true);
-    }
-
-    // Internal stuff
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPreJoin(PrePlayerArenaJoinEvent event) {
-        Logger.DEBUG.log("PrePlayerArenaJoinEvent: " + event.getPlayer().getName());
-        Bukkit.getScheduler().runTask(MissileWars.getInstance(), () -> Bukkit.getPluginManager().callEvent(new PlayerArenaJoinEvent(event.getPlayer(), event.getGame())));
-    }
 }