diff --git a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java
index 4f9ee5c..89099f4 100644
--- a/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java
+++ b/src/main/java/de/fanta/challenges/commands/reset/ResetConfirmCommand.java
@@ -52,8 +52,8 @@
                     p.sendTitle(ChatUtil.BLUE + "Server wird gestoppt!", ChatUtil.RED + "Bitte warte einen Moment" + ChatUtil.BLUE + "." + ChatUtil.GREEN + "." + ChatUtil.YELLOW + ".", 10, 220, 10);
                     GlobalApi.portOnlinePlayerToLocation(p.getName(), "adventure");
                 }
-                plugin.delteTexturePack();
             }
+            plugin.delteTexturePack();
             plugin.getConfig().set("World_Reset", true);
             for (String key : plugin.getConfig().getConfigurationSection("Saved_Locations").getKeys(false)) {
                 plugin.getConfig().set("Saved_Locations." + key, null);
diff --git a/src/main/java/de/fanta/challenges/listeners/EventRegistration.java b/src/main/java/de/fanta/challenges/listeners/EventRegistration.java
index 6782464..6b20558 100644
--- a/src/main/java/de/fanta/challenges/listeners/EventRegistration.java
+++ b/src/main/java/de/fanta/challenges/listeners/EventRegistration.java
@@ -51,6 +51,7 @@
         pM.registerEvents(new EntityListener(), plugin);
         pM.registerEvents(new PlayerListener(), plugin);
         pM.registerEvents(new VoidListener(), plugin);
+        pM.registerEvents(new MinimapListener(), plugin);
 
         pM.registerEvents(new WindowManager(), plugin);
         pM.registerEvents(new EventItemsGui(), plugin);
diff --git a/src/main/java/de/fanta/challenges/listeners/MinimapListener.java b/src/main/java/de/fanta/challenges/listeners/MinimapListener.java
new file mode 100644
index 0000000..5c5d4d8
--- /dev/null
+++ b/src/main/java/de/fanta/challenges/listeners/MinimapListener.java
@@ -0,0 +1,31 @@
+package de.fanta.challenges.listeners;
+
+import de.fanta.challenges.Challenges;
+import de.iani.cubesideutils.bukkit.plugin.api.events.GetMinimapWorldNameEvent;
+import org.bukkit.World;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import java.util.UUID;
+
+public class MinimapListener implements Listener {
+
+    private static final Challenges plugin = Challenges.getPlugin();
+
+    @EventHandler
+    public void getMiniMapWorldName(GetMinimapWorldNameEvent e) {
+        e.setServerName(plugin.getServerType().getPrefix());
+        World world = e.getPlayer().getWorld();
+        String worldName;
+        if (plugin.getConfig().getString("minimap." + world.getName()) != null) {
+            worldName = plugin.getConfig().getString("minimap." + world.getName());
+        } else {
+            UUID worldUUID = UUID.randomUUID();
+            plugin.getConfig().set("minimap." + world.getName(), worldUUID.toString());
+            plugin.saveConfig();
+            worldName = worldUUID.toString();
+        }
+
+        e.setWorldName(worldName);
+    }
+}
diff --git a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java
index 9e3a596..bffe8ff 100644
--- a/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java
+++ b/src/main/java/de/fanta/challenges/utils/SaveWorldUtils.java
@@ -51,7 +51,7 @@
         File savenether = new File(uuid + "/world_nether");
         File saveworld = new File(uuid + "/world");
         File saveconfigs = new File(uuid + "/Challenges");
-        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) {
             File loaddir;
             if (autosafe) {
                 loaddir = new File("/home/minecraft/saves/" + uuid + "/autosave/");