diff --git a/core/src/main/java/mc/core/world/World.java b/core/src/main/java/mc/core/world/World.java
index 20bf437..a6cbf9d 100644
--- a/core/src/main/java/mc/core/world/World.java
+++ b/core/src/main/java/mc/core/world/World.java
@@ -11,7 +11,10 @@ public interface World {
     WorldType getWorldType();
 
     EntityLocation getSpawn();
-    void setSpawn(EntityLocation location);
+    void setSpawn(double x, double y, double z, float yaw, float pitch);
+    default void setSpawn(double x, double y, double z) {
+        setSpawn(x, y, z, 0f, 0f);
+    }
 
     Chunk getChunk(int x, int z);
     void setChunk(int x, int z, Chunk chunkSection);
diff --git a/simple_world/src/main/java/mc/world/simple/SimpleWorld.java b/simple_world/src/main/java/mc/world/simple/SimpleWorld.java
index aa28baa..179e9f0 100644
--- a/simple_world/src/main/java/mc/world/simple/SimpleWorld.java
+++ b/simple_world/src/main/java/mc/world/simple/SimpleWorld.java
@@ -34,9 +34,8 @@ public class SimpleWorld implements World {
     }
 
     @Override
-    public void setSpawn(EntityLocation location) {
-        this.spawn = location;
-        this.spawn.setWorld(this);
+    public void setSpawn(double x, double y, double z, float yaw, float pitch) {
+        this.spawn = new EntityLocation(x, y, z, yaw, pitch, this);
     }
 
     @Override