diff --git a/src/main/java/de/fanta/challenges/challenges/OreBattle.java b/src/main/java/de/fanta/challenges/challenges/OreBattle.java
index 5552b96..0b2e052 100644
--- a/src/main/java/de/fanta/challenges/challenges/OreBattle.java
+++ b/src/main/java/de/fanta/challenges/challenges/OreBattle.java
@@ -51,6 +51,8 @@
                 blocklist.put(Material.DEEPSLATE_REDSTONE_ORE, 1);
                 blocklist.put(Material.COAL_ORE, 1);
                 blocklist.put(Material.DEEPSLATE_COAL_ORE, 1);
+                blocklist.put(Material.LAPIS_ORE, 1);
+                blocklist.put(Material.DEEPSLATE_LAPIS_ORE, 1);
                 setRunning(true);
             } else {
                 setRunning(false);
diff --git a/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java b/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java
index 9928a72..849daf4 100644
--- a/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java
+++ b/src/main/java/de/fanta/challenges/scoreboard/ScoreManager.java
@@ -84,7 +84,11 @@
         sb.append("=".repeat(20));
         sb.append('\n');
         sb.append("Editor: ").append(ownerName).append('\n');
-        sb.append("Erstellt von: ").append(player.getName()).append('\n');
+        if (player != null) {
+            sb.append("Erstellt von: ").append(player.getName()).append('\n');
+        } else {
+            sb.append("Erstellt von: Unbekannt").append('\n');
+        }
         sb.append("Erstellt am: ").append(formatter.format(currentTime)).append('\n');
         sb.append("Timer: ").append(plugin.getTimer().formatTime()).append('\n');
         if (Objects.equals(plugin.getConfig().getString("event.type"), "sammelfieber")) {
diff --git a/src/main/java/de/fanta/challenges/teams/TeamUtils.java b/src/main/java/de/fanta/challenges/teams/TeamUtils.java
index 08604ab..17b8a3b 100644
--- a/src/main/java/de/fanta/challenges/teams/TeamUtils.java
+++ b/src/main/java/de/fanta/challenges/teams/TeamUtils.java
@@ -3,7 +3,6 @@
 import de.fanta.challenges.Challenges;
 import de.fanta.challenges.guis.eventgui.TeamSelectGUI;
 import de.fanta.challenges.utils.ChatUtil;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
 import org.bukkit.Material;
@@ -29,22 +28,15 @@
 
 public class TeamUtils {
 
+    private static final HashMap<Player, ChallengeTeam> playerTeams = new HashMap<>();
+    private static final NamespacedKey selectKey = new NamespacedKey(Challenges.getPlugin(), "selectitem");
     private static ChallengeTeam[] teams;
-
     private static int teamsize;
-
     private static Team[] scoreboardTeams;
-
     private static Scoreboard scoreboard;
-
     private static Score[] scoreboardScores;
-
     private static Objective teamscoreboardObjective;
 
-    private static HashMap<Player, ChallengeTeam> playerTeams = new HashMap<>();
-
-    private static NamespacedKey selectKey = new NamespacedKey(Challenges.getPlugin(), "selectitem");
-
     private static ChallengeTeam createDefaultTeam(int nr) {
         if (nr == 0) {
             return new ChallengeTeam("Schwarz", ChatColor.BLACK, createDisplayItem(Color.fromRGB(0, 0, 0), ChatColor.BLACK, "Schwarz"));
@@ -200,36 +192,34 @@
 
     public static void selectTeam(Player player, ChallengeTeam team) {
         ChallengeTeam oldteam = playerTeams.get(player);
-        if (playerTeams != null) {
-            if (team != null && !Challenges.getPlugin().getConfig().getBoolean("event.teams")) {
-                ChatUtil.sendErrorMessage(player, "In dieser Arena können keine Teams gewählt werden!");
-                return;
-            }
-            if (team != null && oldteam == team) {
-                ChatUtil.sendNormalMessage(player, "Du bist bereits in Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + ".");
-                return;
-            }
-            int count = Collections.frequency(new ArrayList<>(playerTeams.values()), team);
-            if (team != null && count >= teamsize) {
-                ChatUtil.sendNormalMessage(player, "Das Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " ist voll.");
-                return;
-            }
-            playerTeams.put(player, team);
-            ChatUtil.sendNormalMessage(player, "Du bist nun in Team " + team.getChatColor() + team.getName());
-
-            if (oldteam != null) {
-                scoreboard.getTeam(oldteam.getName()).removePlayer(player);
-            }
-            scoreboard.getTeam(team.getName()).addPlayer(player);
-
-            TeamSelectGUI.updateTeamSelectGui();
-            Challenges.getPlugin().getSBManager().setScoreboardtoTeam(team);
+        if (team != null && !Challenges.getPlugin().getConfig().getBoolean("event.teams")) {
+            ChatUtil.sendErrorMessage(player, "In dieser Arena können keine Teams gewählt werden!");
+            return;
         }
+        if (team != null && oldteam == team) {
+            ChatUtil.sendNormalMessage(player, "Du bist bereits in Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + ".");
+            return;
+        }
+        int count = Collections.frequency(new ArrayList<>(playerTeams.values()), team);
+        if (team != null && count >= teamsize) {
+            ChatUtil.sendNormalMessage(player, "Das Team " + team.getChatColor() + team.getName() + ChatUtil.GREEN + " ist voll.");
+            return;
+        }
+        playerTeams.put(player, team);
+        ChatUtil.sendNormalMessage(player, "Du bist nun in Team " + team.getChatColor() + team.getName());
+
+        if (oldteam != null) {
+            scoreboard.getTeam(oldteam.getName()).removePlayer(player);
+        }
+        scoreboard.getTeam(team.getName()).addPlayer(player);
+
+        TeamSelectGUI.updateTeamSelectGui();
+        Challenges.getPlugin().getSBManager().setScoreboardtoTeam(team);
     }
 
     public static void setAllPlayerWithoutTeamToTeam() {
         ArrayList<Player> playersWithoutTeam = new ArrayList<>();
-        for (Player pp : Bukkit.getOnlinePlayers()) {
+        for (Player pp : Challenges.getPlugin().getVanish().getPlayerListWithoutVanishPlayers()) {
             if (getPlayerTeam(pp) == null) {
                 playersWithoutTeam.add(pp);
             }
@@ -252,6 +242,7 @@
                 Team team = TeamUtils.getScoreboard().getTeam(challengeTeam.getName());
                 if (team != null && team.getEntries().isEmpty()) {
                     selectTeam(playersWithoutTeam.get(0), challengeTeam);
+                    playersWithoutTeam.remove(0);
                 }
             }
         }