From 7ee11dcb2947b8411a533ef7f5bb6de512f0a495 Mon Sep 17 00:00:00 2001
From: Josh Larson <joshlarson2015@gmail.com>
Date: Tue, 8 Oct 2019 19:36:49 -0400
Subject: [PATCH] Fixed some long-overdue modernization of LoginClusterStatus
 and LoginEnumCluster

---
 .../packets/swg/login/LoginClusterStatus.java | 23 +++++++++++++------
 .../packets/swg/login/LoginEnumCluster.java   |  5 ++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/projectswg/common/network/packets/swg/login/LoginClusterStatus.java b/src/main/java/com/projectswg/common/network/packets/swg/login/LoginClusterStatus.java
index f887005..72e7674 100644
--- a/src/main/java/com/projectswg/common/network/packets/swg/login/LoginClusterStatus.java
+++ b/src/main/java/com/projectswg/common/network/packets/swg/login/LoginClusterStatus.java
@@ -26,23 +26,32 @@
  ***********************************************************************************/
 package com.projectswg.common.network.packets.swg.login;
 
-import java.time.ZoneOffset;
-import java.util.List;
-import java.util.Vector;
-
 import com.projectswg.common.data.encodables.galaxy.Galaxy;
 import com.projectswg.common.network.NetBuffer;
 import com.projectswg.common.network.packets.SWGPacket;
 
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class LoginClusterStatus extends SWGPacket {
 	
 	public static final int CRC = getCrc("LoginClusterStatus");
 	
-	private Vector <Galaxy> galaxies;
+	private List<Galaxy> galaxies;
 	
 	public LoginClusterStatus() {
-		galaxies = new Vector<Galaxy>();
+		galaxies = new ArrayList<>();
+	}
+	
+	public LoginClusterStatus(List<Galaxy> galaxies) {
+		this.galaxies = new ArrayList<>(galaxies);
+	}
+	
+	public LoginClusterStatus(NetBuffer data) {
+		galaxies = new ArrayList<>();
+		decode(data);
 	}
 	
 	public void decode(NetBuffer data) {
@@ -96,7 +105,7 @@ public class LoginClusterStatus extends SWGPacket {
 		galaxies.add(g);
 	}
 	
-	public List <Galaxy> getGalaxies() {
+	public List<Galaxy> getGalaxies() {
 		return galaxies;
 	}
 	
diff --git a/src/main/java/com/projectswg/common/network/packets/swg/login/LoginEnumCluster.java b/src/main/java/com/projectswg/common/network/packets/swg/login/LoginEnumCluster.java
index 21a3e75..4834241 100644
--- a/src/main/java/com/projectswg/common/network/packets/swg/login/LoginEnumCluster.java
+++ b/src/main/java/com/projectswg/common/network/packets/swg/login/LoginEnumCluster.java
@@ -46,6 +46,11 @@ public class LoginEnumCluster extends SWGPacket {
 		galaxies = new Vector<Galaxy>();
 	}
 	
+	public LoginEnumCluster(List<Galaxy> galaxies, int maxCharacters) {
+		this.galaxies = new Vector<Galaxy>(galaxies);
+		this.maxCharacters = maxCharacters;
+	}
+	
 	public LoginEnumCluster(int maxCharacters) {
 		galaxies = new Vector<Galaxy>();
 		this.maxCharacters = maxCharacters;