diff --git a/src/main/java/com/projectswg/holocore/resources/support/objects/swg/group/GroupObject.java b/src/main/java/com/projectswg/holocore/resources/support/objects/swg/group/GroupObject.java index 397fafff2..4cee43cd5 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/objects/swg/group/GroupObject.java +++ b/src/main/java/com/projectswg/holocore/resources/support/objects/swg/group/GroupObject.java @@ -54,7 +54,6 @@ public class GroupObject extends SWGObject { private final SWGList groupMembers = new SWGList<>(6, 2, StringType.ASCII); private final MapmemberMap = new ConcurrentHashMap<>(); - private final PickupPointTimer pickupPointTimer = new PickupPointTimer(); private CreatureObject leader = null; private LootRule lootRule = LootRule.FREE_FOR_ALL; @@ -77,13 +76,8 @@ public class GroupObject extends SWGObject { bb.addInt(0); // formationNameCrc // 6 bb.addLong(lootMaster); // 7 bb.addInt(lootRule.getId()); // 8 - bb.addObject(pickupPointTimer); // 9 - bb.addAscii(""); // PickupPoint planetName // 10 - bb.addFloat(0); // x - bb.addFloat(0); // y - bb.addFloat(0); // z - bb.incrementOperandCount(9); + bb.incrementOperandCount(7); } public void formGroup(CreatureObject leader, CreatureObject member) { @@ -249,37 +243,6 @@ public class GroupObject extends SWGObject { groupMembers.sendDeltaMessage(this); } - private static class PickupPointTimer implements Encodable { - - private int start; - private int end; - - public PickupPointTimer() { - start = 0; - end = 0; - } - - @Override - public byte[] encode() { - NetBuffer data = NetBuffer.allocate(8); - data.addInt(start); - data.addInt(end); - return data.array(); - } - - @Override - public void decode(NetBuffer data) { - start = data.getInt(); - end = data.getInt(); - } - - @Override - public int getLength() { - return 8; - } - - } - private static class GroupMember implements Encodable { private CreatureObject creature;