diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java
index 15829ab..e1d6621 100644
--- a/src/main/java/de/fanta/challenges/Challenges.java
+++ b/src/main/java/de/fanta/challenges/Challenges.java
@@ -533,10 +533,12 @@
     }
 
     public void portPlayerToLobby(Player player) {
-        if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_LOAD || plugin.getServerType() == ServerType.CHALLENGE_EVENT) {
+        if (plugin.getServerType() == ServerType.CHALLENGE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) {
             GlobalApi.portOnlinePlayerToLocation(player.getName(), "challenge");
         } else if (plugin.getServerType() == ServerType.ADVENTURE) {
             GlobalApi.portOnlinePlayerToLocation(player.getName(), "adventure");
+        } else if (plugin.getServerType() == ServerType.CHALLENGE_EVENT) {
+            GlobalApi.portOnlinePlayerToLocation(player.getName(), "challenge_event");
         }
     }
 
diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java
index 4bcccab..14761ed 100644
--- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java
+++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/OreBattleChallengeEvent.java
@@ -43,22 +43,22 @@
     public void onActivation(TimerChangedEvent event) {
         if (Objects.equals(Config.getString("event.type"), "orebattle")) {
             if (event.isRunning()) {
-                blocklist.put(Material.EMERALD_ORE, 100);
-                blocklist.put(Material.DEEPSLATE_EMERALD_ORE, 100);
-                blocklist.put(Material.DIAMOND_ORE, 72);
-                blocklist.put(Material.DEEPSLATE_DIAMOND_ORE, 45);
-                blocklist.put(Material.GOLD_ORE, 2);
-                blocklist.put(Material.DEEPSLATE_GOLD_ORE, 11);
-                blocklist.put(Material.IRON_ORE, 4);
-                blocklist.put(Material.DEEPSLATE_IRON_ORE, 15);
+                blocklist.put(Material.EMERALD_ORE, 61);
+                blocklist.put(Material.DEEPSLATE_EMERALD_ORE, 2295);
+                blocklist.put(Material.DIAMOND_ORE, 358);
+                blocklist.put(Material.DEEPSLATE_DIAMOND_ORE, 12);
+                blocklist.put(Material.GOLD_ORE, 3);
+                blocklist.put(Material.DEEPSLATE_GOLD_ORE, 8);
+                blocklist.put(Material.IRON_ORE, 3);
+                blocklist.put(Material.DEEPSLATE_IRON_ORE, 7);
                 blocklist.put(Material.COPPER_ORE, 1);
-                blocklist.put(Material.DEEPSLATE_COPPER_ORE, 36);
-                blocklist.put(Material.REDSTONE_ORE, 43);
-                blocklist.put(Material.DEEPSLATE_REDSTONE_ORE, 7);
-                blocklist.put(Material.COAL_ORE, 1);
-                blocklist.put(Material.DEEPSLATE_COAL_ORE, 93);
-                blocklist.put(Material.LAPIS_ORE, 33);
-                blocklist.put(Material.DEEPSLATE_LAPIS_ORE, 22);
+                blocklist.put(Material.DEEPSLATE_COPPER_ORE, 11);
+                blocklist.put(Material.REDSTONE_ORE, 66);
+                blocklist.put(Material.DEEPSLATE_REDSTONE_ORE, 5);
+                blocklist.put(Material.COAL_ORE, 2);
+                blocklist.put(Material.DEEPSLATE_COAL_ORE, 197);
+                blocklist.put(Material.LAPIS_ORE, 17);
+                blocklist.put(Material.DEEPSLATE_LAPIS_ORE, 12);
 
                 for (Player pp : Bukkit.getOnlinePlayers()) {
                     if (!Config.getBoolean("event.teams")) {
diff --git a/src/main/java/de/fanta/challenges/commands/LeaveCommand.java b/src/main/java/de/fanta/challenges/commands/LeaveCommand.java
index fc20381..a393c1d 100644
--- a/src/main/java/de/fanta/challenges/commands/LeaveCommand.java
+++ b/src/main/java/de/fanta/challenges/commands/LeaveCommand.java
@@ -1,11 +1,9 @@
 package de.fanta.challenges.commands;
 
 import de.fanta.challenges.Challenges;
-import de.fanta.challenges.ServerType;
 import de.fanta.challenges.utils.ChatUtil;
 import de.iani.cubesideutils.bukkit.commands.SubCommand;
 import de.iani.cubesideutils.commands.ArgsParser;
-import de.speedy64.globalport.GlobalApi;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java
index c15b29f..64e62ff 100644
--- a/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java
+++ b/src/main/java/de/fanta/challenges/commands/challenges/ChallengesKickCommand.java
@@ -4,8 +4,6 @@
 import de.fanta.challenges.utils.ChatUtil;
 import de.iani.cubesideutils.bukkit.commands.SubCommand;
 import de.iani.cubesideutils.commands.ArgsParser;
-import de.speedy64.globalport.GlobalApi;
-import org.bukkit.BanList;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;