projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-13 03:13:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
This commit is contained in:
Light2
2014-05-01 21:08:20 +02:00
parent 62593b08de 12ca3ae661
commit 536b51d953
379 changed files with 5722 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/chat/Mail.java
+2 -1
View File
@@ -22,6 +22,7 @@
package services.chat;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.sleepycat.persist.model.Entity;
@@ -40,7 +41,7 @@ public class Mail implements Serializable {
private String message;
private byte status;
private int timeStamp;
private List<WaypointAttachment> attachments;
private List<WaypointAttachment> attachments = new ArrayList<WaypointAttachment>();
public static final byte NEW = 0x4E;
public static final byte READ = 0x52;