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

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AdminData.java
View File

@ -288,7 +288,7 @@ public class AdminData implements IXmlReader
{
if (isGmOnline(player.isGM()))
{
player.sendPacket(new SystemMessage(SystemMessageId.GM_LIST));
player.sendPacket(SystemMessageId.GM_LIST);
for (String name : getAllGmNames(player.isGM()))
{
final SystemMessage sm = new SystemMessage(SystemMessageId.GM_S1);
@ -298,7 +298,7 @@ public class AdminData implements IXmlReader
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.THERE_ARE_NO_GMS_CURRENTLY_VISIBLE_IN_THE_PUBLIC_LIST_AS_THEY_MAY_BE_PERFORMING_OTHER_FUNCTIONS_AT_THE_MOMENT));
player.sendPacket(SystemMessageId.THERE_ARE_NO_GMS_CURRENTLY_VISIBLE_IN_THE_PUBLIC_LIST_AS_THEY_MAY_BE_PERFORMING_OTHER_FUNCTIONS_AT_THE_MOMENT);
}
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java
View File

@ -48,7 +48,7 @@ public class Recipes implements IItemHandler
final RecipeList recipe = RecipeData.getInstance().getRecipeByItemId(item.getItemId());
if (player.hasRecipeList(recipe.getId()))
{
player.sendPacket(new SystemMessage(SystemMessageId.THAT_RECIPE_IS_ALREADY_REGISTERED));
player.sendPacket(SystemMessageId.THAT_RECIPE_IS_ALREADY_REGISTERED);
}
else if (recipe.isDwarvenRecipe())
{
@ -57,7 +57,7 @@ public class Recipes implements IItemHandler
if (recipe.getLevel() > player.getDwarvenCraft())
{
// Cannot add recipe, because create item level too low.
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE));
player.sendPacket(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE);
}
else if (player.getDwarvenRecipeBook().size() >= player.getDwarfRecipeLimit())
{
@ -77,7 +77,7 @@ public class Recipes implements IItemHandler
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_RECIPE_CANNOT_BE_REGISTERED_YOU_DO_NOT_HAVE_THE_ABILITY_TO_CREATE_ITEMS));
player.sendPacket(SystemMessageId.THE_RECIPE_CANNOT_BE_REGISTERED_YOU_DO_NOT_HAVE_THE_ABILITY_TO_CREATE_ITEMS);
}
}
else if (player.hasCommonCraft())
@ -85,7 +85,7 @@ public class Recipes implements IItemHandler
if (recipe.getLevel() > player.getCommonCraft())
{
// Cannot add recipe, because create item level too low.
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE));
player.sendPacket(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE);
}
else if (player.getCommonRecipeBook().size() >= player.getCommonRecipeLimit())
{
@ -105,7 +105,7 @@ public class Recipes implements IItemHandler
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_RECIPE_CANNOT_BE_REGISTERED_YOU_DO_NOT_HAVE_THE_ABILITY_TO_CREATE_ITEMS));
player.sendPacket(SystemMessageId.THE_RECIPE_CANNOT_BE_REGISTERED_YOU_DO_NOT_HAVE_THE_ABILITY_TO_CREATE_ITEMS);
}
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java
View File

@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.model.actor.instance.Monster;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class SoulCrystals implements IItemHandler
{
@ -93,7 +92,7 @@ public class SoulCrystals implements IItemHandler
if (!(target instanceof Monster))
{
// Send a System Message to the caster
player.sendPacket(new SystemMessage(SystemMessageId.INVALID_TARGET));
player.sendPacket(SystemMessageId.INVALID_TARGET);
// Send a Server->Client packet ActionFailed to the Player
player.sendPacket(ActionFailed.STATIC_PACKET);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java
View File

@ -74,7 +74,7 @@ public class Harvest implements ISkillHandler
_target = (Monster) aTargetList;
if (_player != _target.getSeeder())
{
_player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_HARVEST));
_player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_HARVEST);
continue;
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
View File

@ -134,27 +134,27 @@ public class SummonFriend implements ISkillHandler
if ((GrandBossManager.getInstance().getZone(targetPlayer) != null) && !targetPlayer.isGM())
{
activePlayer.sendPacket(new SystemMessage(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING));
activePlayer.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
continue;
}
// Check for the the target's festival status.
if (targetPlayer.isInOlympiadMode())
{
activePlayer.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_CURRENTLY_PARTICIPATING_IN_THE_GRAND_OLYMPIAD));
activePlayer.sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_CURRENTLY_PARTICIPATING_IN_THE_GRAND_OLYMPIAD);
continue;
}
// Check for the the target's festival status.
if (targetPlayer.isFestivalParticipant())
{
activePlayer.sendPacket(new SystemMessage(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING));
activePlayer.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
continue;
}
// Check for the target's jail status, arenas and siege zones.
if (targetPlayer.isInsideZone(ZoneId.PVP))
{
activePlayer.sendPacket(new SystemMessage(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING));
activePlayer.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
continue;
}

13
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Mount.java
View File

@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.Ride;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Broadcast;
/**
@ -51,22 +50,22 @@ public class Mount implements IUserCommandHandler
if (player.isDead())
{
// A strider cannot be ridden when player is dead.
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHEN_DEAD));
player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHEN_DEAD);
}
else if (pet.isDead())
{
// A dead strider cannot be ridden.
player.sendPacket(new SystemMessage(SystemMessageId.A_DEAD_STRIDER_CANNOT_BE_RIDDEN));
player.sendPacket(SystemMessageId.A_DEAD_STRIDER_CANNOT_BE_RIDDEN);
}
else if (pet.isInCombat())
{
// A strider in battle cannot be ridden.
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_IN_BATTLE_CANNOT_BE_RIDDEN));
player.sendPacket(SystemMessageId.A_STRIDER_IN_BATTLE_CANNOT_BE_RIDDEN);
}
else if (player.isInCombat())
{
// A pet cannot be ridden while player is in battle.
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE);
}
else if (!player.isInsideRadius3D(pet, 60))
{
@ -75,13 +74,13 @@ public class Mount implements IUserCommandHandler
}
else if (!GeoEngine.getInstance().canSeeTarget(player, pet))
{
player.sendPacket(new SystemMessage(SystemMessageId.CANNOT_SEE_TARGET));
player.sendPacket(SystemMessageId.CANNOT_SEE_TARGET);
return false;
}
else if (player.isSitting() || player.isMoving())
{
// A strider can be ridden only when player is standing.
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CAN_BE_RIDDEN_ONLY_WHEN_STANDING));
player.sendPacket(SystemMessageId.A_STRIDER_CAN_BE_RIDDEN_ONLY_WHEN_STANDING);
}
else if (!pet.isDead() && !player.isMounted())
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java
View File

@ -71,7 +71,7 @@ public class RecipeManager
return;
}
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_ALTER_YOUR_RECIPE_BOOK_WHILE_ENGAGED_IN_MANUFACTURING);
}
public synchronized void requestMakeItemAbort(Player player)

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BroadcastingTower.java
View File

@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
/**
* The Class BroadcastingTower.
@ -81,7 +80,7 @@ public class BroadcastingTower extends Folk
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.OBSERVATION_IS_ONLY_POSSIBLE_DURING_A_SIEGE));
player.sendPacket(SystemMessageId.OBSERVATION_IS_ONLY_POSSIBLE_DURING_A_SIEGE);
}
}
else if (command.startsWith("observe"))

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Folk.java
View File

@ -126,7 +126,7 @@ public class Folk extends Npc
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN));
player.sendPacket(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN);
}
}
else

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@ -1459,7 +1459,7 @@ public class Clan
// Order of Knights 10000 points per each
if ((pledgeType != -1) && (((_reputationScore < 5000) && (pledgeType < SUBUNIT_KNIGHT1)) || ((_reputationScore < 10000) && (pledgeType > SUBUNIT_ROYAL2))))
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW));
player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW);
return null;
}
@ -1800,12 +1800,12 @@ public class Clan
{
if (player.isGood() && target.isEvil())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET));
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
return false;
}
if (player.isEvil() && target.isGood())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET));
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
return false;
}
}
@ -1903,12 +1903,12 @@ public class Clan
{
if (player.isGood() && target.isEvil())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET));
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
return false;
}
if (player.isEvil() && target.isGood())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET));
player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
return false;
}
}
@ -2281,7 +2281,7 @@ public class Clan
if (!increaseClanLevel)
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_CONDITIONS_NECESSARY_TO_INCREASE_THE_CLAN_S_LEVEL_HAVE_NOT_BEEN_MET));
player.sendPacket(SystemMessageId.THE_CONDITIONS_NECESSARY_TO_INCREASE_THE_CLAN_S_LEVEL_HAVE_NOT_BEEN_MET);
return;
}

17
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@ -45,7 +45,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ChairSit;
import org.l2jmobius.gameserver.network.serverpackets.RecipeShopManageList;
import org.l2jmobius.gameserver.network.serverpackets.Ride;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager;
public class RequestActionUse implements IClientIncomingPacket
@ -261,42 +260,42 @@ public class RequestActionUse implements IClientIncomingPacket
if (player.isDead())
{
// A strider cannot be ridden when dead
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHEN_DEAD));
player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHEN_DEAD);
}
else if (pet.isDead())
{
// A dead strider cannot be ridden.
player.sendPacket(new SystemMessage(SystemMessageId.A_DEAD_STRIDER_CANNOT_BE_RIDDEN));
player.sendPacket(SystemMessageId.A_DEAD_STRIDER_CANNOT_BE_RIDDEN);
}
else if (pet.isInCombat() || pet.isRooted())
{
// A strider in battle cannot be ridden
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_IN_BATTLE_CANNOT_BE_RIDDEN));
player.sendPacket(SystemMessageId.A_STRIDER_IN_BATTLE_CANNOT_BE_RIDDEN);
}
else if (player.isInCombat())
{
// A strider cannot be ridden while in battle
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE);
}
else if (player.isOnEvent())
{
// A strider cannot be ridden while in event
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE);
}
else if (player.isSitting()) // Like L2OFF you can mount also during movement
{
// A strider can be ridden only when standing
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CAN_BE_RIDDEN_ONLY_WHEN_STANDING));
player.sendPacket(SystemMessageId.A_STRIDER_CAN_BE_RIDDEN_ONLY_WHEN_STANDING);
}
else if (player.isFishing())
{
// You can't mount, dismount, break and drop items while fishing
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2));
player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
}
else if (player.isCursedWeaponEquiped())
{
// You can't mount, dismount, break and drop items while weilding a cursed weapon
player.sendPacket(new SystemMessage(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE));
player.sendPacket(SystemMessageId.A_STRIDER_CANNOT_BE_RIDDEN_WHILE_IN_BATTLE);
}
else if (!pet.isDead() && !player.isMounted())
{

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
View File

@ -142,7 +142,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL));
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);
return;
}
}
@ -188,7 +188,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL));
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);
return;
}
}
@ -243,7 +243,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION_SCORE));
player.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION_SCORE);
return;
}
player.getClan().setReputationScore(player.getClan().getReputationScore() - repCost);

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
View File

@ -40,7 +40,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Util;
/**
@ -250,7 +249,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if ((count > Integer.MAX_VALUE) || (!template.isStackable() && (count > 1)))
{
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase invalid quantity of items at the same time.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
@ -285,7 +284,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if ((subTotal + tax) > Integer.MAX_VALUE)
{
// Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " adena worth of goods.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
@ -342,7 +341,7 @@ public class RequestBuyItem implements IClientIncomingPacket
if (list.countDecrease(itemId) && !list.decreaseCount(itemId, count))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Add item to Inventory and adjust update packet

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java
View File

@ -127,7 +127,7 @@ public class RequestBuyProcure implements IClientIncomingPacket
if (count > Integer.MAX_VALUE)
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " items at the same time.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java
View File

@ -27,7 +27,6 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
import org.l2jmobius.gameserver.network.serverpackets.NpcInfo;
import org.l2jmobius.gameserver.network.serverpackets.PetInfo;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestChangePetName implements IClientIncomingPacket
{
@ -57,12 +56,12 @@ public class RequestChangePetName implements IClientIncomingPacket
if (pet.getName() != null)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET));
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_THE_NAME_OF_THE_PET);
return;
}
else if (PetNameTable.getInstance().doesPetNameExist(_name, pet.getTemplate().getNpcId()))
{
player.sendPacket(new SystemMessage(SystemMessageId.THIS_IS_ALREADY_IN_USE_BY_ANOTHER_PET));
player.sendPacket(SystemMessageId.THIS_IS_ALREADY_IN_USE_BY_ANOTHER_PET);
return;
}
else if ((_name.length() < 3) || (_name.length() > 16))
@ -72,7 +71,7 @@ public class RequestChangePetName implements IClientIncomingPacket
}
else if (!PetNameTable.getInstance().isValidPetName(_name))
{
player.sendPacket(new SystemMessage(SystemMessageId.AN_INVALID_CHARACTER_IS_INCLUDED_IN_THE_PET_S_NAME));
player.sendPacket(SystemMessageId.AN_INVALID_CHARACTER_IS_INCLUDED_IN_THE_PET_S_NAME);
return;
}

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@ -79,7 +79,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
final int skillLevel = player.getSkillLevel(Skill.SKILL_CRYSTALLIZE);
if (skillLevel <= 0)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
final ActionFailed af = ActionFailed.STATIC_PACKET;
player.sendPacket(af);
return;
@ -123,7 +123,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
// Check if the char can crystallize C items and return if false;
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_C) && (skillLevel <= 1))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
final ActionFailed af = ActionFailed.STATIC_PACKET;
player.sendPacket(af);
return;
@ -132,7 +132,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
// Check if the user can crystallize B items and return if false;
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_B) && (skillLevel <= 2))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
final ActionFailed af = ActionFailed.STATIC_PACKET;
player.sendPacket(af);
return;
@ -141,7 +141,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
// Check if the user can crystallize A items and return if false;
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_A) && (skillLevel <= 3))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
final ActionFailed af = ActionFailed.STATIC_PACKET;
player.sendPacket(af);
return;
@ -150,7 +150,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
// Check if the user can crystallize S items and return if false;
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_S) && (skillLevel <= 4))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW);
final ActionFailed af = ActionFailed.STATIC_PACKET;
player.sendPacket(af);
return;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@ -146,13 +146,13 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_EXPERIENCE_EXP_TO_ENCHANT_THAT_SKILL));
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_EXPERIENCE_EXP_TO_ENCHANT_THAT_SKILL);
return;
}
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL));
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
return;
}
if (Rnd.get(100) <= rate)

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@ -50,7 +50,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
if (player.isNoble() && _target.matches(player.getName()))
{
player.setTitle(_title);
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_TITLE_HAS_BEEN_CHANGED));
player.sendPacket(SystemMessageId.YOUR_TITLE_HAS_BEEN_CHANGED);
player.broadcastTitleInfo();
}
// Can the player change/give a title?
@ -58,7 +58,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
{
if (player.getClan().getLevel() < 3)
{
player.sendPacket(new SystemMessage(SystemMessageId.A_PLAYER_CAN_ONLY_BE_GRANTED_A_TITLE_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE));
player.sendPacket(SystemMessageId.A_PLAYER_CAN_ONLY_BE_GRANTED_A_TITLE_IF_THE_CLAN_IS_LEVEL_3_OR_ABOVE);
return;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
View File

@ -156,7 +156,7 @@ public class RequestPetUseItem implements IClientIncomingPacket
}
else
{
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_PET_CANNOT_CARRY_THIS_ITEM));
player.sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_THIS_ITEM);
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
View File

@ -125,7 +125,7 @@ public class RequestProcureCropList implements IClientIncomingPacket
if (count > Integer.MAX_VALUE)
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " items at the same time.", Config.DEFAULT_PUNISH);
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
View File

@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestSellItem implements IClientIncomingPacket
{
@ -135,7 +134,7 @@ public class RequestSellItem implements IClientIncomingPacket
final int count = _items[(i * 3) + 2];
if ((count <= 0) || (count > Integer.MAX_VALUE))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
@ -153,14 +152,14 @@ public class RequestSellItem implements IClientIncomingPacket
// Fix exploit during Sell
if (((Integer.MAX_VALUE / count) < price) || (totalPrice > Integer.MAX_VALUE))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}
// Check totalPrice
if (totalPrice <= 0)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED));
player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_QUANTITY_THAT_CAN_BE_INPUTTED);
return;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSocialAction.java
View File

@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.util.Util;
public class RequestSocialAction implements IClientIncomingPacket
@ -49,7 +48,7 @@ public class RequestSocialAction implements IClientIncomingPacket
// You cannot do anything else while fishing
if (player.isFishing())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3));
player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestStartPledgeWar.java
View File

@ -55,7 +55,7 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
if ((playerClan.getLevel() < 3) || (playerClan.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_BE_DECLARED_ONLY_IF_THE_CLAN_IS_LEVEL_THREE_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
player.sendPacket(SystemMessageId.A_CLAN_WAR_CAN_BE_DECLARED_ONLY_IF_THE_CLAN_IS_LEVEL_THREE_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
@ -69,19 +69,19 @@ public class RequestStartPledgeWar implements IClientIncomingPacket
final Clan clan = ClanTable.getInstance().getClanByName(_pledgeName);
if (clan == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST));
player.sendPacket(SystemMessageId.A_CLAN_WAR_CANNOT_BE_DECLARED_AGAINST_A_CLAN_THAT_DOES_NOT_EXIST);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((playerClan.getAllyId() == clan.getAllyId()) && (playerClan.getAllyId() != 0))
{
player.sendPacket(new SystemMessage(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE));
player.sendPacket(SystemMessageId.A_DECLARATION_OF_CLAN_WAR_AGAINST_AN_ALLIED_CLAN_CAN_T_BE_MADE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if ((clan.getLevel() < 3) || (clan.getMembersCount() < Config.ALT_CLAN_MEMBERS_FOR_WAR))
{
player.sendPacket(new SystemMessage(SystemMessageId.A_CLAN_WAR_CAN_BE_DECLARED_ONLY_IF_THE_CLAN_IS_LEVEL_THREE_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER));
player.sendPacket(SystemMessageId.A_CLAN_WAR_CAN_BE_DECLARED_ONLY_IF_THE_CLAN_IS_LEVEL_THREE_OR_ABOVE_AND_THE_NUMBER_OF_CLAN_MEMBERS_IS_FIFTEEN_OR_GREATER);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeDone.java
View File

@ -23,7 +23,6 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class TradeDone implements IClientIncomingPacket
{
@ -83,7 +82,7 @@ public class TradeDone implements IClientIncomingPacket
{
// Trade partner not found, cancel trade
player.cancelActiveTrade();
player.sendPacket(new SystemMessage(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE));
player.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
return;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
View File

@ -237,7 +237,7 @@ public class TradeRequest implements IClientIncomingPacket
if (Util.calculateDistance(player, partner, true) > 150)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE));
player.sendPacket(SystemMessageId.YOUR_TARGET_IS_OUT_OF_RANGE);
player.sendPacket(ActionFailed.STATIC_PACKET);
return;
}

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@ -146,7 +146,7 @@ public class UseItem implements IClientIncomingPacket
if (item.getTemplate().getType2() == ItemTemplate.TYPE2_QUEST)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS));
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
return;
}
@ -173,14 +173,14 @@ public class UseItem implements IClientIncomingPacket
// You cannot do anything else while fishing.
if (player.isFishing() && ((itemId < 6535) || (itemId > 6540)))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3));
player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_3);
return;
}
if ((player.getPkKills() > 0) && ((itemId >= 7816) && (itemId <= 7831)))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(new SystemMessage(SystemMessageId.YOU_ARE_UNABLE_TO_EQUIP_THIS_ITEM_WHEN_YOUR_PK_COUNT_IS_GREATER_THAN_OR_EQUAL_TO_ONE));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
player.sendPacket(SystemMessageId.YOU_ARE_UNABLE_TO_EQUIP_THIS_ITEM_WHEN_YOUR_PK_COUNT_IS_GREATER_THAN_OR_EQUAL_TO_ONE);
return;
}
@ -206,35 +206,35 @@ public class UseItem implements IClientIncomingPacket
// A shield that can only be used by the members of a clan that owns a castle.
if (((clan == null) || (clan.getCastleId() == 0)) && (itemId == 7015) && Config.CASTLE_SHIELD && !player.isGM())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
// A shield that can only be used by the members of a clan that owns a clan hall.
if (((clan == null) || (clan.getHideoutId() == 0)) && (itemId == 6902) && Config.CLANHALL_SHIELD && !player.isGM())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
// Apella armor used by clan members may be worn by a Baron or a higher level Aristocrat.
if ((itemId >= 7860) && (itemId <= 7879) && Config.APELLA_ARMORS && ((clan == null) || (player.getPledgeClass() < 5)) && !player.isGM())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
// Clan Oath armor used by all clan members.
if ((itemId >= 7850) && (itemId <= 7859) && Config.OATH_ARMORS && (clan == null) && !player.isGM())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
// The Lord's Crown used by castle lords only.
if ((itemId == CrownTable.CROWN_OF_THE_LORD) && Config.CASTLE_CROWN && ((clan == null) || (clan.getCastleId() == 0) || !player.isClanLeader()) && !player.isGM())
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
@ -243,14 +243,14 @@ public class UseItem implements IClientIncomingPacket
{
if (clan == null)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
final int circletId = CastleManager.getInstance().getCircletByCastleId(clan.getCastleId());
if ((player.getPledgeType() == -1) || (circletId != itemId))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM));
player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
return;
}
}
@ -294,7 +294,7 @@ public class UseItem implements IClientIncomingPacket
// Like L2OFF you can't use equips while you are casting
if ((player.isCastingNow() || player.isCastingPotionNow() || player.isMounted()))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_EQUIP_ITEMS_WHILE_CASTING_OR_PERFORMING_A_SKILL));
player.sendPacket(SystemMessageId.YOU_MAY_NOT_EQUIP_ITEMS_WHILE_CASTING_OR_PERFORMING_A_SKILL);
return;
}