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

Directly send SystemMessageId when possible.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-06 23:55:25 +00:00
parent f086247c77
commit 53312e19b7
341 changed files with 812 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java vendored
View File

@@ -91,13 +91,13 @@ public class BaylorWarzone extends AbstractInstance
final Party party = player.getParty();
if (!party.isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
return null;
}
if (player.isInCommandChannel())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS));
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
return null;
}
@@ -134,7 +134,7 @@ public class BaylorWarzone extends AbstractInstance
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER));
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
}
}
return super.onAdvEvent(event, npc, player);

7
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java vendored
View File

@@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.model.actor.Playable;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList;
/**
@@ -57,13 +56,13 @@ public class ChangeAttributeCrystal implements IItemHandler
final Player player = playable.getActingPlayer();
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_CHANGE_AN_ATTRIBUTE_WHILE_USING_A_PRIVATE_STORE_OR_WORKSHOP));
player.sendPacket(SystemMessageId.YOU_CANNOT_CHANGE_AN_ATTRIBUTE_WHILE_USING_A_PRIVATE_STORE_OR_WORKSHOP);
return false;
}
if (ITEM_GRADES.get(item.getId()) == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.CHANGING_ATTRIBUTES_HAS_BEEN_FAILED));
player.sendPacket(SystemMessageId.CHANGING_ATTRIBUTES_HAS_BEEN_FAILED);
return false;
}
@@ -78,7 +77,7 @@ public class ChangeAttributeCrystal implements IItemHandler
if (itemList.isEmpty())
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ITEM_FOR_CHANGING_AN_ATTRIBUTE_DOES_NOT_EXIST));
player.sendPacket(SystemMessageId.THE_ITEM_FOR_CHANGING_AN_ATTRIBUTE_DOES_NOT_EXIST);
return false;
}

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/AshenShadowRevolutionaries/AshenShadowRevolutionaries.java vendored
View File

@@ -208,13 +208,13 @@ public class AshenShadowRevolutionaries extends AbstractInstance
final Party party = player.getParty();
if (!party.isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
return null;
}
if (player.isInCommandChannel())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS));
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
return null;
}
@@ -251,7 +251,7 @@ public class AshenShadowRevolutionaries extends AbstractInstance
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER));
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
}
if (player.getInstanceWorld() != null)

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java vendored
View File

@@ -118,13 +118,13 @@ public class CommandPost extends AbstractInstance
if (!party.isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
return null;
}
if (player.isInCommandChannel())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS));
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
return null;
}
@@ -157,7 +157,7 @@ public class CommandPost extends AbstractInstance
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER));
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
}
if (player.getInstanceWorld() != null)

8
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/DimensionalWrap/DimensionalWrap.java vendored
View File

@@ -134,7 +134,7 @@ public class DimensionalWrap extends AbstractInstance
{
if (!player.getParty().isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
}
else
{
@@ -173,7 +173,7 @@ public class DimensionalWrap extends AbstractInstance
}
else if (player.isInParty() && !player.getParty().isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
break;
}
switch (player.getParty().getMemberCount())
@@ -216,7 +216,7 @@ public class DimensionalWrap extends AbstractInstance
}
else if (player.isInParty() && !player.getParty().isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
break;
}
switch (player.getParty().getMemberCount())
@@ -259,7 +259,7 @@ public class DimensionalWrap extends AbstractInstance
}
else if (player.isInParty() && !player.getParty().isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
break;
}
switch (player.getParty().getMemberCount())

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java vendored
View File

@@ -158,13 +158,13 @@ public class KrofinNest extends AbstractInstance
final Party party = player.getParty();
if (!party.isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
return null;
}
if (player.isInCommandChannel())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS));
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
return null;
}
@@ -201,7 +201,7 @@ public class KrofinNest extends AbstractInstance
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER));
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
}
if (player.getInstanceWorld() != null)

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java vendored
View File

@@ -92,13 +92,13 @@ public class NightmareKamaloka extends AbstractInstance
final Party party = player.getParty();
if (!party.isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
return null;
}
if (player.isInCommandChannel())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS));
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
return null;
}
@@ -135,7 +135,7 @@ public class NightmareKamaloka extends AbstractInstance
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER));
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
}
}
else if ("SPAWN_BOSSES".equals(event))

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java vendored
View File

@@ -59,13 +59,13 @@ public class SpiritForest extends AbstractInstance
final Party party = player.getParty();
if (!party.isLeader(player))
{
player.sendPacket(new SystemMessage(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER));
player.sendPacket(SystemMessageId.ONLY_A_PARTY_LEADER_CAN_MAKE_THE_REQUEST_TO_ENTER);
return null;
}
if (player.isInCommandChannel())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS));
player.sendPacket(SystemMessageId.YOU_CANNOT_ENTER_BECAUSE_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
return null;
}
@@ -102,7 +102,7 @@ public class SpiritForest extends AbstractInstance
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER));
player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_IN_A_PARTY_SO_YOU_CANNOT_ENTER);
}
}
return null;