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

Dropped addCharName message parameter.

Browse Source
This commit is contained in:
MobiusDev
2018-02-20 18:44:52 +00:00
parent be738375da
commit 055da88da9
179 changed files with 301 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,7 +267,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
// Add the mentee skill
handleMenteeSkills(player);
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addCharName(player));
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addString(player.getName()));
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
}
@@ -283,7 +283,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
MentorManager.getInstance().cancelAllMentoringBuffs(mentor.getPlayerInstance());
}
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player));
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addString(player.getName()));
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
}
@@ -319,7 +319,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
}
}
mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addCharName(player));
mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addString(player.getName()));
mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance()));
});
@@ -342,7 +342,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader
startQuestTimer("REMOVE_BUFFS " + player.getObjectId(), 5 * 60 * 1000, null, null);
MentorManager.getInstance().getMentees(player.getObjectId()).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee ->
{
mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addCharName(player));
mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addString(player.getName()));
mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance()));
});
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java vendored
View File

@@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler
if (!targetPlayer.isClanLeader())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
sm.addCharName(targetPlayer);
sm.addString(targetPlayer.getName());
activeChar.sendPacket(sm);
showMainPage(activeChar);
return false;

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java vendored
View File

@@ -80,7 +80,7 @@ public final class CallPc extends AbstractEffect
target.addScript(new SummonRequestHolder(activeChar, skill));
final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId());
confirm.addCharName(activeChar);
confirm.addString(activeChar.getName());
confirm.addZoneName(activeChar.getX(), activeChar.getY(), activeChar.getZ());
confirm.addTime(30000);
confirm.addRequesterId(activeChar.getObjectId());
@@ -134,7 +134,7 @@ public final class CallPc extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2);
sm.addCharName(target);
sm.addString(target.getName());
activeChar.sendPacket(sm);
return false;
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java vendored
View File

@@ -81,7 +81,7 @@ public final class Cp extends AbstractEffect
if ((effector != null) && (effector != effected))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
sm.addInt((int) amount);
effected.sendPacket(sm);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java vendored
View File

@@ -78,7 +78,7 @@ public final class HealPercent extends AbstractEffect
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
}
else
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java vendored
View File

@@ -82,7 +82,7 @@ public final class Hp extends AbstractEffect
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
}
else
{

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java vendored
View File

@@ -67,8 +67,8 @@ public final class MagicalAttackMp extends AbstractEffect
if (effected.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN);
sm.addCharName(effected);
sm.addCharName(effector);
sm.addString(effected.getName());
sm.addString(effector.getName());
effected.sendPacket(sm);
}
return false;
@@ -112,7 +112,7 @@ public final class MagicalAttackMp extends AbstractEffect
if (effected.isPlayer())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
sm.addInt((int) mp);
effected.sendPacket(sm);
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java vendored
View File

@@ -75,7 +75,7 @@ public final class ManaHeal extends AbstractEffect
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
}
else
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java vendored
View File

@@ -128,7 +128,7 @@ public final class ManaHealByLevel extends AbstractEffect
final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED);
if (effector.getObjectId() != effected.getObjectId())
{
sm.addCharName(effector);
sm.addString(effector.getName());
}
sm.addInt((int) amount);
effected.sendPacket(sm);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java vendored
View File

@@ -75,7 +75,7 @@ public final class ManaHealPercent extends AbstractEffect
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
}
else
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java vendored
View File

@@ -82,7 +82,7 @@ public final class Mp extends AbstractEffect
if (effector.getObjectId() != effected.getObjectId())
{
sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1);
sm.addCharName(effector);
sm.addString(effector.getName());
}
else
{

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java vendored
View File

@@ -95,7 +95,7 @@ public class TeleportToPlayer extends AbstractEffect
if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2);
sm.addCharName(target);
sm.addString(target.getName());
effector.sendPacket(sm);
return;
}