Directly send SystemMessageId when possible.
This commit is contained in:
		@@ -81,13 +81,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;
 | 
			
		||||
				}
 | 
			
		||||
				
 | 
			
		||||
@@ -121,7 +121,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);
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
 
 | 
			
		||||
@@ -165,13 +165,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;
 | 
			
		||||
					}
 | 
			
		||||
					
 | 
			
		||||
@@ -205,7 +205,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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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())
 | 
			
		||||
 
 | 
			
		||||
@@ -78,13 +78,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;
 | 
			
		||||
					}
 | 
			
		||||
					
 | 
			
		||||
@@ -118,7 +118,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);
 | 
			
		||||
				}
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user