diff --git a/src/party/_2a03/mc/command/SpawnCommand.java b/src/party/_2a03/mc/command/SpawnCommand.java
index beb0060..344c096 100644
--- a/src/party/_2a03/mc/command/SpawnCommand.java
+++ b/src/party/_2a03/mc/command/SpawnCommand.java
@@ -1,6 +1,7 @@
 package party._2a03.mc.command;
 
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.Commands;
 import net.minecraft.util.text.TranslationTextComponent;
@@ -11,11 +12,27 @@ import party._2a03.mc.server.PlayerPosition;
 
 public class SpawnCommand {
 	public static void register(CommandDispatcher<CommandSource> dispatcher) {
-		dispatcher.register(Commands.func_197057_a("spawn").executes((source) -> {
+		LiteralArgumentBuilder<CommandSource> literalargumentbuilder = Commands.func_197057_a("spawn").executes((source) -> {
 			PlayerPosition position = Config.parsePosition(Config.getData("spawn"));
 			((ServerPlayerEntity)source.getSource().func_197035_h()).func_200619_a(position.world, position.x, position.y, position.z, position.yaw, position.pitch);
 			source.getSource().func_197030_a(new TranslationTextComponent("Teleported to the spawn point"), true);
 			return 1;
+		});
+		literalargumentbuilder.then(Commands.func_197057_a("set").requires((source) -> {
+			return source.func_197034_c(2);
+		}).executes((source) -> {
+			ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
+			double x = playerEntity.field_70165_t;
+			double y = playerEntity.field_70163_u;
+			double z = playerEntity.field_70161_v;
+			float yaw = playerEntity.field_70177_z;
+			float pitch = playerEntity.field_70125_A;
+			ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
+			PlayerPosition location = new PlayerPosition(x, y, z, yaw, pitch, world);
+			Config.setData("spawn", location.getJSON());
+			source.getSource().func_197030_a(new TranslationTextComponent("Spawn has been set"), true);
+			return 1;
 		}));
+		dispatcher.register(literalargumentbuilder);
 	}
 }
diff --git a/src/party/_2a03/mc/server/Config.java b/src/party/_2a03/mc/server/Config.java
index 889beaa..a5ef11d 100644
--- a/src/party/_2a03/mc/server/Config.java
+++ b/src/party/_2a03/mc/server/Config.java
@@ -76,6 +76,11 @@ public class Config {
 		return json.getJSONArray(key);
 	}
 
+	public static void setData(String key, JSONArray data) {
+		json.put(key, data);
+		saveConfig();
+	}
+
 	public static PlayerPosition parsePosition(JSONArray data) {
 		double x = data.getDouble(0);
 		double y = data.getDouble(1);