lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mentee marks sent by mail.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-03-28 13:13:36 +00:00
parent 1bf6e18fc5
commit 65827bb613
7 changed files with 49 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }

18
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }

18
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }

18
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }

18
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }

18
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }

18
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java vendored
View File

@@ -48,6 +48,7 @@ import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentee
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerMentorStatus;
import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import com.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.itemcontainer.Mail;
import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.BuffInfo;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -219,7 +220,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
handleMentorSkills(event.getMentor()); handleMentorSkills(event.getMentor());
// Send mail with the headphone // Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1); sendMail(event.getMentee().getObjectId(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
} }
@RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS) @RegisterEvent(EventType.ON_PLAYER_MENTEE_STATUS)
@@ -506,7 +507,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player)); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1); sendMail(player.getObjectId(), MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
} }
} }
@@ -530,20 +531,15 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
final int amount = MENTEE_COINS.get(player.getLevel()); final int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0) if (amount > 0)
{ {
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount); sendMail(mentor.getObjectId(), LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
} }
} }
private void sendMail(PlayerInstance player, String title, String body, int itemId, long amount) private void sendMail(int objectId, String title, String body, int itemId, long amount)
{
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, PlayerInstance player, String title, String body, int itemId, long amount)
{ {
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC); final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player); final Mail attachments = msg.createAttachments();
attachments.addItem(getName(), itemId, amount, null, null);
MailManager.getInstance().sendMessage(msg); MailManager.getInstance().sendMessage(msg);
} }