From c22213cbe9b1af08cc0b45087d57957158b98bb0 Mon Sep 17 00:00:00 2001 From: Light2 Date: Mon, 31 Mar 2014 17:33:53 +0200 Subject: [PATCH] fixed startup error, temp fix for radial bug --- .../swg/objectControllerObjects/ObjectMenuResponse.java | 3 ++- src/services/object/ObjectService.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java b/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java index f7533788..fd833068 100644 --- a/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java +++ b/src/protocol/swg/objectControllerObjects/ObjectMenuResponse.java @@ -77,7 +77,8 @@ public class ObjectMenuResponse extends ObjControllerObject { result.put(++counter); result.put(radialOption.getParentId()); result.putShort(radialOption.getOptionId()); - result.put(radialOption.getOptionType()); //result.put((byte) 3); + //result.put(radialOption.getOptionType()); + result.put((byte) 3); result.put(getUnicodeString(radialOption.getDescription())); } result.put(radialCount); diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 19c2941d..451ab5b5 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -916,14 +916,14 @@ public class ObjectService implements INetworkDispatch { ((BuildingObject) object).getTransaction().commitSync(); }*/ } else { - object = createObject(template, objectId, planet, new Point3D(px + x1, py, pz + z1), new Quaternion(qw, qx, qy, qz), null, false, false); + object = createObject(template, 0, planet, new Point3D(px + x1, py, pz + z1), new Quaternion(qw, qx, qy, qz), null, false, false); } if(object == null) continue; object.setContainerPermissions(WorldPermissions.WORLD_PERMISSIONS); if(radius > 256) object.setAttachment("bigSpawnRange", new Boolean(true)); - if (!duplicate.containsValue(objectId) && object instanceof BuildingObject) + if (!duplicate.containsValue(objectId) && object instanceof BuildingObject && portalCRC != 0) persistentBuildings.add((BuildingObject) object); } else if(containerId != 0) { object = createObject(template, 0, planet, new Point3D(px, py, pz), new Quaternion(qw, qx, qy, qz), null, false, false);