diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/other/WorldSpawnCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/other/WorldSpawnCommand.java
deleted file mode 100644
index 56357ef2..00000000
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/other/WorldSpawnCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is a part of the SteamWar software.
- *
- * Copyright (C) 2021  SteamWar.de-Serverteam
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.other;
-
-import de.steamwar.bausystem.linkage.LinkageType;
-import de.steamwar.bausystem.linkage.Linked;
-import de.steamwar.command.SWCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerTeleportEvent;
-
-@Linked(LinkageType.COMMAND)
-public class WorldSpawnCommand extends SWCommand {
-
-    private static final World WORLD = Bukkit.getWorlds().get(0);
-
-    public WorldSpawnCommand() {
-        super("worldspawn");
-    }
-
-    @Register(description = "OTHER_WORLDSPAWN_HELP")
-    public void genericCommand(Player p) {
-        p.teleport(WORLD.getSpawnLocation().add(0.5, 0, 0.5), PlayerTeleportEvent.TeleportCause.COMMAND);
-    }
-}
\ No newline at end of file
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
index 2d8fface..6cbc6c10 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/warp/Warp.java
@@ -33,10 +33,21 @@ public class Warp {
 
     private static Map<String, Warp> warpMap = new HashMap<>();
 
+    static {
+        Warp worldSpawn = new Warp("WorldSpawn");
+        worldSpawn.setLocation(Bukkit.getWorlds().get(0).getSpawnLocation());
+        worldSpawn.setMat(Material.NETHER_STAR);
+        warpMap.put("WorldSpawn", worldSpawn);
+    }
+
     private String name;
     private Location location;
     private Material mat;
 
+    private Warp(String name) {
+        this.name = name;
+    }
+
     public Warp(String name, Player player) {
         this.name = name;
         this.location = player.getLocation();