Merge pull request #18 from P-333/master

JustBru00 · web-flow · commit 9cbf5526ac6a · 2024-01-12T20:29:20.000-05:00
Closes #17
diff --git a/src/com/frosthex/timingsystem/restapi/network/SparkManager.java b/src/com/frosthex/timingsystem/restapi/network/SparkManager.java
@@ -400,7 +400,7 @@ private static JsonObject serializeLocation(Location loc) {
 			obj.addProperty("z",loc.getZ());
 			obj.addProperty("pitch",loc.getPitch());
 			obj.addProperty("yaw",loc.getYaw());
-			obj.addProperty("world_name",loc.getWorld().getName());
+			obj.addProperty("world_name", loc.isWorldLoaded() ? loc.getWorld().getName() : "null");
 		}	
 		
 		return obj;

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ private static JsonObject serializeLocation(Location loc) {`
`400`	`400`	`obj.addProperty("z",loc.getZ());`
`401`	`401`	`obj.addProperty("pitch",loc.getPitch());`
`402`	`402`	`obj.addProperty("yaw",loc.getYaw());`
`403`		`- obj.addProperty("world_name",loc.getWorld().getName());`
	`403`	`+ obj.addProperty("world_name", loc.isWorldLoaded() ? loc.getWorld().getName() : "null");`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`return obj;`