From 75249a6a42fea6efa7aa5a596da7132cac967b29 Mon Sep 17 00:00:00 2001
From: Ryan Fox <flewkey@2a03.party>
Date: Sat, 27 Jul 2019 22:13:24 +0000
Subject: [PATCH] Move parsePosition method to PlayerPosition constructor.

Signed-off-by: Ryan Fox <flewkey@2a03.party>
---
 src/party/_2a03/mc/command/SpawnCommand.java  |  2 +-
 src/party/_2a03/mc/server/Config.java         | 19 ++++---------------
 src/party/_2a03/mc/server/PlayerPosition.java | 13 +++++++++++++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/party/_2a03/mc/command/SpawnCommand.java b/src/party/_2a03/mc/command/SpawnCommand.java
index 9a05c70..0ac697c 100644
--- a/src/party/_2a03/mc/command/SpawnCommand.java
+++ b/src/party/_2a03/mc/command/SpawnCommand.java
@@ -13,7 +13,7 @@ import party._2a03.mc.server.PlayerPosition;
 public class SpawnCommand {
 	public static void register(CommandDispatcher<CommandSource> dispatcher) {
 		LiteralArgumentBuilder<CommandSource> literalargumentbuilder = Commands.func_197057_a("spawn").executes((source) -> {
-			PlayerPosition position = Config.parsePosition(Config.getData("spawn"));
+			PlayerPosition position = new PlayerPosition(Config.getData("spawn"));
 			if (position.world == null) {
 				if (source.getSource().func_197034_c(2)) {
 					source.getSource().func_197030_a(new TranslationTextComponent("Spawn not found, do /spawn set"), false);
diff --git a/src/party/_2a03/mc/server/Config.java b/src/party/_2a03/mc/server/Config.java
index 2b82dfe..974f566 100644
--- a/src/party/_2a03/mc/server/Config.java
+++ b/src/party/_2a03/mc/server/Config.java
@@ -45,7 +45,7 @@ public class Config {
 			JSONObject item = members.getJSONObject(i);
 			String item_uuid = item.getString("uuid");
 			if (item_uuid.equals(uuid)) {
-				home = parsePosition(item.getJSONArray("home"));
+				home = new PlayerPosition(item.getJSONArray("home"));
 			}
 		}
 		if (home == null) {
@@ -80,20 +80,9 @@ public class Config {
 		json.put(key, data);
 		saveConfig();
 	}
-
-	public static PlayerPosition parsePosition(JSONArray data) {
-		double x = data.getDouble(0);
-		double y = data.getDouble(1);
-		double z = data.getDouble(2);
-		float yaw = data.getFloat(3);
-		float pitch = data.getFloat(4);
-		int dimension_id = data.getInt(5);
-		if (dimension_id != -2) {
-			ServerWorld world = worlds.get(DimensionType.func_186069_a(dimension_id));
-			return new PlayerPosition(x, y, z, yaw, pitch, world);
-		} else {
-			return new PlayerPosition();
-		}
+	
+	public static ServerWorld getWorld(int dimension_id) {
+		return worlds.get(DimensionType.func_186069_a(dimension_id));
 	}
 
 	private static void saveConfig() {
diff --git a/src/party/_2a03/mc/server/PlayerPosition.java b/src/party/_2a03/mc/server/PlayerPosition.java
index 2d023f2..ac7e121 100644
--- a/src/party/_2a03/mc/server/PlayerPosition.java
+++ b/src/party/_2a03/mc/server/PlayerPosition.java
@@ -2,6 +2,7 @@ package party._2a03.mc.server;
 
 import org.json.JSONArray;
 import net.minecraft.world.server.ServerWorld;
+import party._2a03.mc.server.Config;
 
 public class PlayerPosition {
 	public double x;
@@ -13,6 +14,18 @@ public class PlayerPosition {
 
 	public PlayerPosition() {
 	}
+	
+	public PlayerPosition(JSONArray data) {
+		int dimension_id = data.getInt(5);
+		if (dimension_id != -2) {
+			this.x = data.getDouble(0);
+			this.y = data.getDouble(1);
+			this.z = data.getDouble(2);
+			this.yaw = data.getFloat(3);
+			this.pitch = data.getFloat(4);
+			this.world = Config.getWorld(dimension_id);
+		}
+	}
 
 	public PlayerPosition(double p_x, double p_y, double p_z, float p_yaw, float p_pitch, ServerWorld p_world) {
 		this.x = p_x;