Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/chathandlers/ChatTell.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/chathandlers/ChatTell.java (modified) (6 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/chathandlers/ChatTell.java

@@ -22 +22 @@
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
 
@@ -39 +38 @@
         /**
          * Handle chat type 'tell'
-         * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
+         * @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String, java.lang.String)
          */
+        @Override
         public void handleChat(int type, L2PcInstance activeChar, String target, String text)
         {
                 if (activeChar.isChatBanned() && Util.contains(Config.BAN_CHAT_CHANNELS, type))
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED));
+                        activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
                         return;
                 }
@@ -51 +51 @@
                 if (Config.JAIL_DISABLE_CHAT && activeChar.isInJail() && !activeChar.isGM())
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CHATTING_PROHIBITED));
+                        activeChar.sendPacket(SystemMessageId.CHATTING_PROHIBITED);
                         return;
                 }
@@ -73 +73 @@
                         if (receiver.isChatBanned())
                         {
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE));
+                                activeChar.sendPacket(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE);
                                 return;
                         }
@@ -91 +91 @@
                         }
                         else
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE));
+                                activeChar.sendPacket(SystemMessageId.THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE);
                 }
                 else
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME));
+                        activeChar.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
         }
         
@@ -101 +101 @@
          * @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
          */
+        @Override
         public int[] getChatTypeList()
         {