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

Renamed TELL and NPC_TELL chat types, also fixed minor typo in L2PcInstance.

Browse Source 
Source L2J Ertheia branch:
48e9f32ede
9e6d13a293
This commit is contained in:
mobius
2015-02-09 14:14:26 +00:00
parent f9a65fe3c1
commit 46efd67919
17 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/Config.java
View File

@ -1919,7 +1919,7 @@ public final class Config
BBS_DEFAULT = General.getString("BBSDefault", "_bbshome");
USE_SAY_FILTER = General.getBoolean("UseChatFilter", false);
CHAT_FILTER_CHARS = General.getString("ChatFilterChars", "^_^");
final String[] propertySplit4 = General.getString("BanChatChannels", "GENERAL;SHOUT;GLOBAL;TRADE;HERO_VOICE").trim().split(";");
final String[] propertySplit4 = General.getString("BanChatChannels", "GENERAL;SHOUT;WORLD;TRADE;HERO_VOICE").trim().split(";");
BAN_CHAT_CHANNELS = new HashSet<>();
try
{

6
trunk/java/com/l2jserver/gameserver/enums/ChatType.java
View File

@ -25,7 +25,7 @@ public enum ChatType
{
GENERAL(0),
SHOUT(1),
TELL(2),
WHISPER(2),
PARTY(3),
CLAN(4),
GM(5),
@ -47,8 +47,8 @@ public enum ChatType
MPCC_ROOM(21),
NPC_GENERAL(22),
NPC_SHOUT(23),
NPC_TELL(24),
GLOBAL(25);
NPC_WHISPER(24),
WORLD(25);
private final int _clientId;

4
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -930,7 +930,7 @@ public final class L2PcInstance extends L2Playable
private boolean _hasCharmOfCourage = false;
private final Set<Integer> _whispepers = ConcurrentHashMap.newKeySet();
private final Set<Integer> _whisperers = ConcurrentHashMap.newKeySet();
private int _jumpTrackId = 0;
@ -15177,6 +15177,6 @@ public final class L2PcInstance extends L2Playable
*/
public Set<Integer> getWhisperers()
{
return _whispepers;
return _whisperers;
}
}

2
trunk/java/com/l2jserver/gameserver/model/entity/TvTEvent.java
View File

@ -855,7 +855,7 @@ public class TvTEvent
killerTeam.increasePoints();
CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), ChatType.TELL, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!");
CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!");
for (L2PcInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values())
{

8
trunk/java/com/l2jserver/gameserver/network/clientpackets/Say2.java
View File

@ -95,7 +95,7 @@ public final class Say2 extends L2GameClientPacket
{
_text = readS();
_type = readD();
_target = (_type == ChatType.TELL.getClientId()) ? readS() : null;
_target = (_type == ChatType.WHISPER.getClientId()) ? readS() : null;
}
@Override
@ -138,7 +138,7 @@ public final class Say2 extends L2GameClientPacket
return;
}
if (Config.L2WALKER_PROTECTION && (chatType == ChatType.TELL) && checkBot(_text))
if (Config.L2WALKER_PROTECTION && (chatType == ChatType.WHISPER) && checkBot(_text))
{
Util.handleIllegalPlayerAction(activeChar, "Client Emulator Detect: Player " + activeChar.getName() + " using l2walker.", Config.DEFAULT_PUNISH);
return;
@ -168,7 +168,7 @@ public final class Say2 extends L2GameClientPacket
if (activeChar.isJailed() && Config.JAIL_DISABLE_CHAT)
{
if ((chatType == ChatType.TELL) || (chatType == ChatType.SHOUT) || (chatType == ChatType.TRADE) || (chatType == ChatType.HERO_VOICE))
if ((chatType == ChatType.WHISPER) || (chatType == ChatType.SHOUT) || (chatType == ChatType.TRADE) || (chatType == ChatType.HERO_VOICE))
{
activeChar.sendMessage("You can not chat with players outside of the jail.");
return;
@ -185,7 +185,7 @@ public final class Say2 extends L2GameClientPacket
final LogRecord record = new LogRecord(Level.INFO, _text);
record.setLoggerName("chat");
if (chatType == ChatType.TELL)
if (chatType == ChatType.WHISPER)
{
record.setParameters(new Object[]
{

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/CreatureSay.java
View File

@ -154,7 +154,7 @@ public final class CreatureSay extends L2GameServerPacket
if (_text != null)
{
writeS(_text);
if ((_charLevel > 0) && (_textType == ChatType.TELL))
if ((_charLevel > 0) && (_textType == ChatType.WHISPER))
{
writeC(_mask);
if ((_mask & 0x10) == 0)