From e7bf8736f758a2ca26473bd34e381ab8458924ba Mon Sep 17 00:00:00 2001
From: Mads Boddum <danish_cyborg@hotmail.com>
Date: Tue, 15 Nov 2016 01:15:43 +0100
Subject: [PATCH] Fixed an issue where name and detail string IDs for objects
 weren't persisted

---
 src/resources/objects/SWGObject.java | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 54e30e09..688b1895 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -897,7 +897,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	
 	@Override
 	public void save(NetBufferStream stream) {
-		stream.addByte(1);
+		stream.addByte(2);
 		location.save(stream);
 		stream.addBoolean(parent != null && parent.getClassification() != ObjectClassification.GENERATED);
 		if (parent != null && parent.getClassification() != ObjectClassification.GENERATED)
@@ -905,6 +905,8 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		stream.addAscii(permissions.name());
 		stream.addAscii(classification.name());
 		stream.addUnicode(objectName);
+		stringId.save(stream);
+		detailStringId.save(stream);
 		stream.addFloat(complexity);
 		stream.addFloat((float) prefLoadRange);
 		synchronized (attributes) {
@@ -926,6 +928,9 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	
 	public void read(NetBufferStream stream) {
 		switch(stream.getByte()) {
+			case 2:
+				readVersion2(stream);
+				break;
 			case 1:
 				readVersion1(stream);
 				break;
@@ -935,6 +940,21 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		}
 	}
 	
+	private void readVersion2(NetBufferStream stream) {
+		location.read(stream);
+		if (stream.getBoolean())
+			parent = SWGObjectFactory.create(stream);
+		permissions = ContainerPermissionsType.valueOf(stream.getAscii());
+		classification = ObjectClassification.valueOf(stream.getAscii());
+		objectName = stream.getUnicode();
+		stringId.read(stream);
+		detailStringId.read(stream);
+		complexity = stream.getFloat();
+		prefLoadRange = stream.getFloat();
+		stream.getList((i) -> attributes.put(stream.getAscii(), stream.getAscii()));
+		stream.getList((i) -> SWGObjectFactory.create(stream).moveToContainer(this));
+	}
+	
 	private void readVersion1(NetBufferStream stream) {
 		location.read(stream);
 		if (stream.getBoolean())