Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.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/ChatHeroVoice.java (modified) (3 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.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;
 
@@ -40 +39 @@
         /**
          * Handle chat type 'hero voice'
-         * @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
@@ -49 +48 @@
                         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;
                         }
                         
-                        if (!activeChar.isGM() && !activeChar.getFloodProtectors().getHeroVoice().tryPerformAction("hero voice"))
+                        if (!activeChar.getFloodProtectors().getHeroVoice().tryPerformAction("hero voice"))
                         {
                                 activeChar.sendMessage("Action failed. Heroes are only able to speak in the global channel once every 10 seconds.");