Changeset 1503

(2010/03/12 19:47) Almost 2 years ago

- MAIL. no express mail for now. Will be done a bit later.

Use mail-1503.sql to put new table to DB.

Affected files

trunk/AE-go_GameServer/data/scripts/system/database/mysql5/MySQL5MailDAO.java

Show contents

trunk/AE-go_GameServer/data/scripts/system/database/mysql5/MySQL5PlayerDAO.java Download diff

	1502		1503
90	@Override	90	@Override
91	public void storePlayer(final Player player)	91	public void storePlayer(final Player player)
92	{	92	{
93	DB.insertUpdate("UPDATE players SET name=?, exp=?, recoverexp=?, x=?, y=?, z=?, heading=?, world_id=?, player_class=?, last_online=?, cube_size=?, warehouse_size=?, note=?, bind_point=?, title_id=? WHERE id=?", new IUStH(){	93	DB.insertUpdate("UPDATE players SET name=?, exp=?, recoverexp=?, x=?, y=?, z=?, heading=?, world_id=?, player_class=?, last_online=?, cube_size=?, warehouse_size=?, note=?, bind_point=?, title_id=?, mailboxLetters=? WHERE id=?", new IUStH(){
94	@Override	94	@Override
95	public void handleInsertUpdate(PreparedStatement stmt) throws SQLException	95	public void handleInsertUpdate(PreparedStatement stmt) throws SQLException
96	{	96	{
...		...
111	stmt.setString(13,player.getCommonData().getNote());	111	stmt.setString(13,player.getCommonData().getNote());
112	stmt.setInt(14, player.getCommonData().getBindPoint());	112	stmt.setInt(14, player.getCommonData().getBindPoint());
113	stmt.setInt(15, player.getCommonData().getTitleId());	113	stmt.setInt(15, player.getCommonData().getTitleId());
114	stmt.setInt(16, player.getObjectId());	114	stmt.setInt(16, player.getMailbox().getLettersCount());
		115	stmt.setInt(17, player.getObjectId());
115	stmt.execute();	116	stmt.execute();
116	}	117	}
117	});	118	});
...		...
157		158
158	private Object pcdLock = new Object();	159	private Object pcdLock = new Object();
159		160
		161
		162	@Override
		163	public PlayerCommonData loadPlayerCommonDataByName(final String name, final World world)
		164	{
		165	final List<Integer> playerObjId = new ArrayList<Integer>();
		166
		167	DB.select("SELECT id FROM players WHERE name = ?", new ParamReadStH(){
		168
		169	@Override
		170	public void setParams(PreparedStatement stmt) throws SQLException
		171	{
		172	stmt.setString(1, name);
		173	}
		174
		175	@Override
		176	public void handleRead(ResultSet resultSet) throws SQLException
		177	{
		178	resultSet.next();
		179
		180	playerObjId.add(resultSet.getInt("id"));
		181	}
		182	});
		183
		184	if(playerObjId.size() == 0)
		185	return null;
		186	else
		187	return loadPlayerCommonData(playerObjId.get(0), world, null);
		188	}
		189
160	/**	190	/**
161	* {@inheritDoc}	191	* {@inheritDoc}
162	*/	192	*/
...		...
199	cd.setBindPoint(resultSet.getInt("bind_point"));	229	cd.setBindPoint(resultSet.getInt("bind_point"));
200	cd.setTitleId(resultSet.getInt("title_id"));	230	cd.setTitleId(resultSet.getInt("title_id"));
201	cd.setWarehouseSize(resultSet.getInt("warehouse_size"));	231	cd.setWarehouseSize(resultSet.getInt("warehouse_size"));
		232	cd.setOnline(resultSet.getBoolean("online"));
		233	cd.setMailboxLetters(resultSet.getInt("mailboxLetters"));
202		234
203	float x = resultSet.getFloat("x");	235	float x = resultSet.getFloat("x");
204	float y = resultSet.getFloat("y");	236	float y = resultSet.getFloat("y");
...		...
206	byte heading = resultSet.getByte("heading");	238	byte heading = resultSet.getByte("heading");
207	int worldId = resultSet.getInt("world_id");	239	int worldId = resultSet.getInt("world_id");
208		240
209	if(z < -1000)	241	if(z < -1000 && playerInitialData != null)
210	{	242	{
211	//unstuck unlucky characters :)	243	//unstuck unlucky characters :)
212	LocationData ld = playerInitialData.getSpawnLocation(cd.getRace());	244	LocationData ld = playerInitialData.getSpawnLocation(cd.getRace());

trunk/AE-go_GameServer/sql/au_server_gs.sql Download diff

	1502		1503
32	`last_online` timestamp NOT NULL default '0000-00-00 00:00:00' on update CURRENT_TIMESTAMP,	32	`last_online` timestamp NOT NULL default '0000-00-00 00:00:00' on update CURRENT_TIMESTAMP,
33	`cube_size` tinyint(1) NOT NULL default '0',	33	`cube_size` tinyint(1) NOT NULL default '0',
34	`warehouse_size` tinyint(1) NOT NULL default '0',	34	`warehouse_size` tinyint(1) NOT NULL default '0',
		35	`mailboxLetters` tinyint(4) NOT NULL default '0',
35	`bind_point` INT NOT NULL default '0',	36	`bind_point` INT NOT NULL default '0',
36	`title_id` int(3) NOT NULL default '-1',	37	`title_id` int(3) NOT NULL default '-1',
37	`online` tinyint(1) NOT NULL default '0',	38	`online` tinyint(1) NOT NULL default '0',
...		...
313	PRIMARY KEY (`player_id`),	314	PRIMARY KEY (`player_id`),
314	FOREIGN KEY (`player_id`) REFERENCES `players` (`id`) ON DELETE CASCADE ON UPDATE CASCADE	315	FOREIGN KEY (`player_id`) REFERENCES `players` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
315	) ENGINE=InnoDB DEFAULT CHARSET=utf8;	316	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		317
		318
		319	-- ----------------------------
		320	-- mail_table
		321	-- ----------------------------
		322	CREATE TABLE IF NOT EXISTS `mail` (
		323	`mailUniqueId` int(11) NOT NULL, `mailRecipientId` int(11) NOT NULL,
		324	`senderName` varchar(16) character set utf8 NOT NULL,`mailTitle` varchar(20) character set utf8 NOT NULL,
		325	`mailMessage` varchar(500) character set utf8 NOT NULL, `unread` tinyint(4) NOT NULL default '1',
		326	`attachedItemId` int(11) NOT NULL, `attachedKinahCount` int(11) NOT NULL,
		327	`express` tinyint(4) NOT NULL default '0',
		328	`recievedTime` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
		329	PRIMARY KEY (`mailUniqueId`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;

trunk/AE-go_GameServer/sql/Update/mail-1503.sql

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/dao/MailDAO.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/dao/PlayerDAO.java Download diff

 	public abstract void setPlayersOffline(final boolean online);
 	/**
+	 * get commondata by name for MailService
+	 * @param name
+	 * @return
+	 */
+	public abstract PlayerCommonData loadPlayerCommonDataByName(String name, final World world);
+	/**
 	 * Identifier name for all PlayerDAO classes
 	 *
 	 * @return PlayerDAO.class.getName()

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/Letter.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/Mailbox.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/Player.java Download diff

	1502		1503
65	private Storage regularWarehouse;	65	private Storage regularWarehouse;
66	private Storage accountWarehouse;	66	private Storage accountWarehouse;
67	private Equipment equipment;	67	private Equipment equipment;
		68	private Mailbox mailbox;
68	private PrivateStore store;	69	private PrivateStore store;
69	private PlayerStatsTemplate playerStatsTemplate;	70	private PlayerStatsTemplate playerStatsTemplate;
70	private TitleList titleList;	71	private TitleList titleList;
...		...
827	{	828	{
828	this.invul = invul;	829	this.invul = invul;
829	}	830	}
		831
		832	public void setMailbox(Mailbox mailbox)
		833	{
		834	this.mailbox = mailbox;
		835	}
		836
		837	public Mailbox getMailbox()
		838	{
		839	return mailbox;
		840	}
830		841
831	}	842	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/PlayerCommonData.java Download diff

	1502		1503
65	private int bindPoint;	65	private int bindPoint;
66	private int titleId = -1;	66	private int titleId = -1;
67	private int dp = 0;	67	private int dp = 0;
		68	private int mailboxLetters;
68		69
69	public PlayerCommonData(int objId)	70	public PlayerCommonData(int objId)
70	{	71	{
...		...
423	{	424	{
424	return warehouseSize;	425	return warehouseSize;
425	}	426	}
		427
		428	public void setMailboxLetters(int count)
		429	{
		430	this.mailboxLetters = count;
		431	}
		432
		433	public int getMailboxLetters()
		434	{
		435	return mailboxLetters;
		436	}
426	}	437	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/gameobjects/player/StorageType.java Download diff

	1502		1503
14	CUBE(0),	14	CUBE(0),
15	REGULAR_WAREHOUSE(1),	15	REGULAR_WAREHOUSE(1),
16	ACCOUNT_WAREHOUSE(2),	16	ACCOUNT_WAREHOUSE(2),
17	LEGION_WAREHOUSE(3);	17	LEGION_WAREHOUSE(3),
		18	MAILBOX(127);
18		19
19	private int id;	20	private int id;
20		21

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/templates/mail/MailMessage.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_DELETE_MAIL.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_ENTER_WORLD.java Download diff

 import com.aionemu.gameserver.network.aion.serverpackets.SM_INFLUENCE_RATIO;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_INVENTORY_INFO;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_MACRO_LIST;
+import com.aionemu.gameserver.network.aion.serverpackets.SM_MAIL_SERVICE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_MESSAGE;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_PLAYER_ID;
 import com.aionemu.gameserver.network.aion.serverpackets.SM_PLAYER_SPAWN;
 			player.setRates(Rates.getRatesFor(client.getAccount().getMembership()));
 			ClassChangeService.showClassChangeDialog(player);
 			// TODO need some task
 			sendPacket(new SM_RIFT_ANNOUNCE(player));
+			sendPacket(new SM_MAIL_SERVICE(player, player.getMailbox().getLettersOnly()));
+			if(player.getMailbox().haveUnread())
+				sendPacket(new SM_MAIL_SERVICE(true, true));
 		}
 		else
 		{

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_GET_MAIL_ATTACHMENT.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_READ_MAIL.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_SEND_MAIL.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/InventoryPacket.java Download diff

 		writeD(buf, itemTemplate.getNameId());
 		writeH(buf, 0);
 	}
+	protected void writeMailGeneralInfo(ByteBuffer buf, Item item)
+	{
+		writeD(buf, item.getObjectId());
+		ItemTemplate itemTemplate = item.getItemTemplate();
+		writeD(buf, itemTemplate.getTemplateId());
+		writeD(buf, 1);
+		writeD(buf, 0);
+		writeH(buf, 0x24);
+		writeD(buf, itemTemplate.getNameId());
+		writeH(buf, 0);
+	}
 	/**
 	 *  All misc items
 	 * @param buf
 	 * @param item
 	 */
-	protected void writeGeneralItemInfo(ByteBuffer buf, Item item, boolean isQuest, boolean privateStore)
+	protected void writeGeneralItemInfo(ByteBuffer buf, Item item, boolean isQuest, boolean privateStore, boolean mail)
 	{
 		writeH(buf, 0x16); //length of details
 		writeC(buf, 0);
 		if(!privateStore)
 			writeH(buf, 0);
 		writeC(buf, 0);
-		writeH(buf, item.getEquipmentSlot()); // not equipable items
+		if(!mail)
+			writeH(buf, item.getEquipmentSlot()); // not equipable items
 	}
 	/**
 	 */
 	protected void writeWeaponInfo(ByteBuffer buf, Item item, boolean isInventory)
 	{
-		this.writeWeaponInfo(buf, item, isInventory, false, false);
+		this.writeWeaponInfo(buf, item, isInventory, false, false, false);
 	}
 	/**
 	 * @param buf
 	 * @param item
 	 */
-	protected void writeWeaponInfo(ByteBuffer buf, Item item, boolean isInventory, boolean isWeaponSwitch, boolean privateStore)
+	protected void writeWeaponInfo(ByteBuffer buf, Item item, boolean isInventory, boolean isWeaponSwitch, boolean privateStore, boolean mail)
 	{
 		int itemSlotId = item.getEquipmentSlot();
 			if(!privateStore)
 				writeH(buf, 0);
 			writeC(buf, 0);
-			writeH(buf, item.isEquipped() ? 255 : item.getEquipmentSlot()); // FF FF equipment
+			if(!mail)
+				writeH(buf, item.isEquipped() ? 255 : item.getEquipmentSlot()); // FF FF equipment
 			if(isInventory)
 				writeC(buf,  0);//item.isEquipped() ? 1 : 0
 		}
 	 * @param buf
 	 * @param item
 	 */
-	protected void writeArmorInfo(ByteBuffer buf, Item item, boolean isInventory, boolean privateStore)
+	protected void writeArmorInfo(ByteBuffer buf, Item item, boolean isInventory, boolean privateStore, boolean mail)
 	{
 		int itemSlotId = item.getEquipmentSlot();
 		writeH(buf, 0x4F);
 		if(!privateStore)
 			writeH(buf, 0);
 		writeC(buf, 0);
-		writeH(buf, item.isEquipped() ? 255 : item.getEquipmentSlot()); // FF FF equipment
+		if(!mail)
+			writeH(buf, item.isEquipped() ? 255 : item.getEquipmentSlot()); // FF FF equipment
 		if(isInventory)
 			writeC(buf,  1);//item.isEquipped() ? 1 : 0
 	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/MailServicePacket.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_EXCHANGE_ADD_ITEM.java Download diff

	1502		1503
60	}	60	}
61	else if (itemTemplate.isArmor())	61	else if (itemTemplate.isArmor())
62	{	62	{
63	writeArmorInfo(buf,item, true, false);	63	writeArmorInfo(buf,item, true, false, false);
64	}	64	}
65	else	65	else
66	{	66	{
67	writeGeneralItemInfo(buf, item, false, false);	67	writeGeneralItemInfo(buf, item, false, false, false);
68	writeC(buf, 0);	68	writeC(buf, 0);
69	}	69	}
70	}	70	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_INVENTORY_INFO.java Download diff

	1502		1503
102	}	102	}
103	else if (itemTemplate.isArmor())	103	else if (itemTemplate.isArmor())
104	{	104	{
105	writeArmorInfo(buf,item, true, false);	105	writeArmorInfo(buf,item, true, false, false);
106	}	106	}
107	else	107	else
108	{	108	{
109	writeGeneralItemInfo(buf, item, false, false);	109	writeGeneralItemInfo(buf, item, false, false, false);
110	writeC(buf, 0);	110	writeC(buf, 0);
111	}	111	}
112	}	112	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_INVENTORY_UPDATE.java Download diff

	1502		1503
66	}	66	}
67	else if (itemTemplate.isArmor())	67	else if (itemTemplate.isArmor())
68	{	68	{
69	writeArmorInfo(buf,item, true, false);	69	writeArmorInfo(buf,item, true, false, false);
70	}	70	}
71	else	71	else
72	{	72	{
73	writeGeneralItemInfo(buf, item, item.isQuest(), false);	73	writeGeneralItemInfo(buf, item, item.isQuest(), false, false);
74	writeC(buf, 0);	74	writeC(buf, 0);
75	}	75	}
76	}	76	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_MAIL_SERVICE.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_PRIVATE_STORE.java Download diff

	1502		1503
64		64
65	if (itemTemplate.isWeapon())	65	if (itemTemplate.isWeapon())
66	{	66	{
67	writeWeaponInfo(buf, item, false, false, true);	67	writeWeaponInfo(buf, item, false, false, true, false);
68	}	68	}
69	else if (itemTemplate.isArmor())	69	else if (itemTemplate.isArmor())
70	{	70	{
71	writeArmorInfo(buf, item, false, true);	71	writeArmorInfo(buf, item, false, true, false);
72	}	72	}
73	else	73	else
74	{	74	{
75	writeGeneralItemInfo(buf, item, false, true);	75	writeGeneralItemInfo(buf, item, false, true, false);
76	}	76	}
77	}	77	}
78	}	78	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_UPDATE_ITEM.java Download diff

	1502		1503
69	}	69	}
70	else if (itemTemplate.isWeapon())	70	else if (itemTemplate.isWeapon())
71	{	71	{
72	writeWeaponInfo(buf, item, true, isWeaponSwitch, false);	72	writeWeaponInfo(buf, item, true, isWeaponSwitch, false, false);
73	}	73	}
74	else if (itemTemplate.isArmor())	74	else if (itemTemplate.isArmor())
75	{	75	{
76	writeArmorInfo(buf,item, true, false);	76	writeArmorInfo(buf,item, true, false, false);
77	}	77	}
78	else	78	else
79	{	79	{
80	writeGeneralItemInfo(buf, item, item.isQuest(), false);	80	writeGeneralItemInfo(buf, item, item.isQuest(), false, false);
81	}	81	}
82	}	82	}
83		83

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_UPDATE_WAREHOUSE_ITEM.java Download diff

	1502		1503
44	}	44	}
45	else if (itemTemplate.isArmor())	45	else if (itemTemplate.isArmor())
46	{	46	{
47	writeArmorInfo(buf,item, false, false);	47	writeArmorInfo(buf,item, false, false, false);
48	}	48	}
49	else	49	else
50	{	50	{
51	writeGeneralItemInfo(buf, item, item.isQuest(), false);	51	writeGeneralItemInfo(buf, item, item.isQuest(), false, false);
52	}	52	}
53	}	53	}
54		54

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_WAREHOUSE_INFO.java Download diff

	1502		1503
74	writeWeaponInfo(buf, item, false);	74	writeWeaponInfo(buf, item, false);
75		75
76	else if (itemTemplate.isArmor())	76	else if (itemTemplate.isArmor())
77	writeArmorInfo(buf, item, false, false);	77	writeArmorInfo(buf, item, false, false, false);
78		78
79	else	79	else
80	writeGeneralItemInfo(buf, item, false, false);	80	writeGeneralItemInfo(buf, item, false, false, false);
81	}	81	}
82	}	82	}
83		83

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/serverpackets/SM_WAREHOUSE_UPDATE.java Download diff

	1502		1503
49	}	49	}
50	else if (itemTemplate.isArmor())	50	else if (itemTemplate.isArmor())
51	{	51	{
52	writeArmorInfo(buf,item, false, false);	52	writeArmorInfo(buf,item, false, false, false);
53	}	53	}
54	else	54	else
55	{	55	{
56	writeGeneralItemInfo(buf, item, item.isQuest(), false);	56	writeGeneralItemInfo(buf, item, item.isQuest(), false, false);
57	}	57	}
58		58
59	}	59	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/ServerPacketsOpcodes.java Download diff

	1502		1503
173	addPacketOpcode(SM_STATUPDATE_MP.class, 0xFC, idSet);	173	addPacketOpcode(SM_STATUPDATE_MP.class, 0xFC, idSet);
174	addPacketOpcode(SM_ATTACK_STATUS.class, 0xFD, idSet);	174	addPacketOpcode(SM_ATTACK_STATUS.class, 0xFD, idSet);
175	addPacketOpcode(SM_RECONNECT_KEY.class, 0xFF, idSet);	175	addPacketOpcode(SM_RECONNECT_KEY.class, 0xFF, idSet);
176		176	addPacketOpcode(SM_MAIL_SERVICE.class, 0xA1, idSet);
177	addPacketOpcode(SM_CUSTOM_PACKET.class, 99999, idSet); // fake packet	177	addPacketOpcode(SM_CUSTOM_PACKET.class, 99999, idSet); // fake packet
178		178
179	// Unrecognized Opcodes from 1.5.4:	179	// Unrecognized Opcodes from 1.5.4:

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/factories/AionPacketHandlerFactory.java Download diff

 import com.aionemu.gameserver.network.aion.clientpackets.CM_FRIEND_DEL;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_FRIEND_STATUS;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_GATHER;
+import com.aionemu.gameserver.network.aion.clientpackets.CM_GET_MAIL_ATTACHMENT;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_GODSTONE_SOCKET;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_GROUP_DISTRIBUTION;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_GROUP_RESPONSE;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_VERIFY_LOCATION;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_VERSION_CHECK;
 import com.aionemu.gameserver.network.aion.clientpackets.CM_VIEW_PLAYER_DETAILS;
+import com.aionemu.gameserver.network.aion.clientpackets.CM_SEND_MAIL;
+import com.aionemu.gameserver.network.aion.clientpackets.CM_READ_MAIL;
+import com.aionemu.gameserver.network.aion.clientpackets.CM_DELETE_MAIL;
 import com.google.inject.Injector;
 /**
 		addPacket(new CM_PRIVATE_STORE(0x6D), State.IN_GAME);
 		addPacket(new CM_PRIVATE_STORE_NAME(0x6E), State.IN_GAME);
 		addPacket(new CM_SKILL_DEACTIVATE(0x88), State.IN_GAME);
+		addPacket(new CM_SEND_MAIL(0x6A), State.IN_GAME);
+		addPacket(new CM_READ_MAIL(0x7C), State.IN_GAME);
+		addPacket(new CM_GET_MAIL_ATTACHMENT(0x7E), State.IN_GAME);
+		addPacket(new CM_DELETE_MAIL(0x7F),State.IN_GAME);
 		addPacket(new CM_MANASTONE_REMOVE(0x4F), State.IN_GAME);
 	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/MailService.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/PlayerService.java Download diff

 import com.aionemu.gameserver.dao.FriendListDAO;
 import com.aionemu.gameserver.dao.InventoryDAO;
 import com.aionemu.gameserver.dao.ItemStoneListDAO;
+import com.aionemu.gameserver.dao.MailDAO;
 import com.aionemu.gameserver.dao.PlayerAppearanceDAO;
 import com.aionemu.gameserver.dao.PlayerDAO;
 import com.aionemu.gameserver.dao.PlayerMacrossesDAO;
 import com.aionemu.gameserver.model.gameobjects.PersistentState;
 import com.aionemu.gameserver.model.gameobjects.player.Equipment;
 import com.aionemu.gameserver.model.gameobjects.player.MacroList;
+import com.aionemu.gameserver.model.gameobjects.player.Mailbox;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.gameobjects.player.PlayerAppearance;
 import com.aionemu.gameserver.model.gameobjects.player.PlayerCommonData;
 		DAOManager.getDAO(PlayerPunishmentsDAO.class).storePlayerPunishments(player);
 		DAOManager.getDAO(InventoryDAO.class).store(player);
 		DAOManager.getDAO(ItemStoneListDAO.class).save(player);
+		DAOManager.getDAO(MailDAO.class).storeMailbox(player);
 	}
 	/**
 		player.getEquipment().onLoadApplyEquipmentStats();
 		itemService.loadItemStones(player);
+		player.setMailbox(DAOManager.getDAO(MailDAO.class).loadPlayerMailbox(player));
 		// if kinah was deleted by some reason it should be restored with 0 count
 		if(player.getStorage(StorageType.CUBE.getId()).getKinahItem() == null)
 		Storage regularWarehouse = new Storage(newPlayer, StorageType.REGULAR_WAREHOUSE);
 		Storage accountWarehouse = new Storage(newPlayer, StorageType.ACCOUNT_WAREHOUSE);
 		Equipment equipment = new Equipment(newPlayer);
+		Mailbox mailbox = new Mailbox(newPlayer);
 		newPlayer.setStorage(playerInventory, StorageType.CUBE);
 		newPlayer.setStorage(regularWarehouse, StorageType.REGULAR_WAREHOUSE);
 		newPlayer.setStorage(accountWarehouse, StorageType.ACCOUNT_WAREHOUSE);
 		newPlayer.setEquipment(equipment);
+		newPlayer.setMailbox(mailbox);
 		for(ItemType itemType : items)
 		{

trunk/AE-go_GameServer/src/com/aionemu/gameserver/utils/guice/DataInjectionModule.java Download diff

 import com.aionemu.gameserver.services.GroupService;
 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.services.LegionService;
+import com.aionemu.gameserver.services.MailService;
 import com.aionemu.gameserver.services.PlayerService;
 import com.aionemu.gameserver.services.PeriodicSaveService;
 import com.aionemu.gameserver.services.PrivateStoreService;
 		bind(DuelService.class).in(Scopes.SINGLETON);
 		bind(ServiceProxy.class).in(Scopes.SINGLETON);
 		bind(QuestService.class).in(Scopes.SINGLETON);
+		bind(MailService.class).in(Scopes.SINGLETON);
 	}
 	@Provides

trunk/AE-go_GameServer/src/com/aionemu/gameserver/utils/guice/IDFactoriesInjectionModule.java Download diff

 import com.aionemu.commons.database.dao.DAOManager;
 import com.aionemu.gameserver.dao.InventoryDAO;
 import com.aionemu.gameserver.dao.LegionDAO;
+import com.aionemu.gameserver.dao.MailDAO;
 import com.aionemu.gameserver.dao.PlayerDAO;
 import com.aionemu.gameserver.utils.idfactory.IDFactory;
 import com.aionemu.gameserver.utils.idfactory.IDFactoryAionObject;
 		idFactory.lockIds(DAOManager.getDAO(PlayerDAO.class).getUsedIDs());
 		idFactory.lockIds(DAOManager.getDAO(InventoryDAO.class).getUsedIDs());
 		idFactory.lockIds(DAOManager.getDAO(LegionDAO.class).getUsedIDs());
+		idFactory.lockIds(DAOManager.getDAO(MailDAO.class).getUsedIDs());
 		return idFactory;
 	}