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

Fixed compile errors from merge

Browse Source
This commit is contained in:
Waverunner
2015-10-13 10:02:35 -04:00
parent 71e7f12e5c
commit 72dc61b730
3 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/group/GroupObject.java
+4 -4
View File
@@ -27,7 +27,6 @@
package resources.objects.group;
import intents.NotifyPlayersPacketIntent;
import network.packets.Packet;
import network.packets.swg.zone.baselines.Baseline;
import resources.collections.SWGList;
@@ -40,10 +39,7 @@ import utilities.Encoder;
import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class GroupObject extends SWGObject { // Extends INTO or TANO?
@@ -166,6 +162,8 @@ public class GroupObject extends SWGObject { // Extends INTO or TANO?
}
private static class PickupPointTimer implements Serializable, Encodable {
private static final long serialVersionUID = 1L;
public int start;
public int end;
@@ -186,6 +184,8 @@ public class GroupObject extends SWGObject { // Extends INTO or TANO?
}
private static class GroupMember implements Serializable, Encodable {
private static final long serialVersionUID = 1L;
private long id;
private String name;