projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-06 21:13:37 -04:00
Code Issues Projects Releases Wiki Activity

Added parent to serialized output

Browse Source
This commit is contained in:
Obique PSWG
2016-05-30 00:16:48 -05:00
parent 6c3e0c612c
commit 576b2bd8be
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGObject.java
+10 -21
View File
@@ -58,6 +58,7 @@ import resources.player.Player;
import resources.player.PlayerState;
import resources.server_info.Log;
import services.CoreManager;
import services.objects.ObjectCreator;
import java.util.ArrayList;
import java.util.Collection;
@@ -1077,28 +1078,14 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
* Only sent if they are defined (can still be empty if defined).
*/
/*
private SWGObject parent = null;
private final Location location;
private final Map <String, String> attributes;
private ContainerPermissions containerPermissions;
private ObjectClassification classification = ObjectClassification.GENERATED;
private String objectName = "";
private int volume = 0;
private float complexity = 1;
private int containerType = 0;
private double loadRange = 0;
private int areaId = -1;
private final HashMap <String, SWGObject> slots;
private final Map<Long, SWGObject> containedObjects;
*/
@Override
public void save(NetBufferStream stream) {
stream.addByte(0);
stream.addByte(1);
location.save(stream);
containerPermissions.save(stream);
ContainerPermissionsFactory.save(containerPermissions, stream);
stream.addBoolean(parent != null && parent.getClassification() != ObjectClassification.GENERATED);
if (parent != null && parent.getClassification() != ObjectClassification.GENERATED)
SWGObjectFactory.save(ObjectCreator.createObjectFromTemplate(parent.getObjectId(), parent.getTemplate()), stream);
synchronized (attributes) {
stream.addMap(attributes, (e) -> {
stream.addAscii(e.getKey());
@@ -1122,9 +1109,11 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
}
public void read(NetBufferStream stream) {
stream.getByte();
byte ver = stream.getByte();
location.read(stream);
containerPermissions.read(stream);
containerPermissions = ContainerPermissionsFactory.create(stream);
if (ver >= 1 && stream.getBoolean())
parent = SWGObjectFactory.create(stream);
stream.getList((i) -> attributes.put(stream.getAscii(), stream.getAscii()));
classification = ObjectClassification.valueOf(stream.getAscii());
objectName = stream.getUnicode();