Config to disable World chat.

This commit is contained in:
MobiusDev 2017-05-01 11:32:20 +00:00
parent ab939796cd
commit 6892014a09
18 changed files with 72 additions and 6 deletions

View File

@ -357,6 +357,10 @@ GlobalChat = ON
# Default: ON
TradeChat = ON
# World Chat.
# Default: False
WorldChatEnabled = False
# Minimum level for chat, 0 = disable
# Default: 20
MinimumChatLevel = 20

View File

@ -367,7 +367,10 @@ public class AdminAdmin implements IAdminCommandHandler
activeChar.sendMessage(targetPlayer.getName() + ": points changed from " + targetPlayer.getWorldChatPoints() + " to " + valueToken);
targetPlayer.setWorldChatPoints(Integer.parseInt(valueToken));
if (Config.ENABLE_WORLD_CHAT)
{
targetPlayer.sendPacket(new ExWorldChatCnt(targetPlayer));
}
break;
}
default:

View File

@ -47,6 +47,11 @@ public final class ChatWorld implements IChatHandler
@Override
public void handleChat(ChatType type, L2PcInstance activeChar, String target, String text)
{
if (!Config.ENABLE_WORLD_CHAT)
{
return;
}
final Instant now = Instant.now();
if (!REUSE.isEmpty())
{

View File

@ -471,6 +471,7 @@ public final class Config
public static int PEACE_ZONE_MODE;
public static String DEFAULT_GLOBAL_CHAT;
public static String DEFAULT_TRADE_CHAT;
public static boolean ENABLE_WORLD_CHAT;
public static int MINIMUM_CHAT_LEVEL;
public static boolean ALLOW_WAREHOUSE;
public static boolean WAREHOUSE_CACHE;
@ -1766,6 +1767,7 @@ public final class Config
PEACE_ZONE_MODE = General.getInt("PeaceZoneMode", 0);
DEFAULT_GLOBAL_CHAT = General.getString("GlobalChat", "ON");
DEFAULT_TRADE_CHAT = General.getString("TradeChat", "ON");
ENABLE_WORLD_CHAT = General.getBoolean("WorldChatEnabled", false);
MINIMUM_CHAT_LEVEL = General.getInt("MinimumChatLevel", 20);
ALLOW_WAREHOUSE = General.getBoolean("AllowWarehouse", true);
WAREHOUSE_CACHE = General.getBoolean("WarehouseCache", false);

View File

@ -188,6 +188,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
private void resetWorldChatPoints()
{
if (!Config.ENABLE_WORLD_CHAT)
{
return;
}
// Update data for offline players.
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE character_variables SET val = ? WHERE var = ?"))

View File

@ -641,7 +641,10 @@ public class EnterWorld implements IClientIncomingPacket
}
activeChar.sendPacket(new ExAcquireAPSkillList(activeChar));
if (Config.ENABLE_WORLD_CHAT)
{
activeChar.sendPacket(new ExWorldChatCnt(activeChar));
}
activeChar.sendPacket(new ExOneDayReceiveRewardList(activeChar));
activeChar.sendPacket(ExConnectedTimeAndGettableReward.STATIC_PACKET);

View File

@ -357,6 +357,10 @@ GlobalChat = ON
# Default: ON
TradeChat = ON
# World Chat.
# Default: True
WorldChatEnabled = True
# Minimum level for chat, 0 = disable
# Default: 20
MinimumChatLevel = 20

View File

@ -367,7 +367,10 @@ public class AdminAdmin implements IAdminCommandHandler
activeChar.sendMessage(targetPlayer.getName() + ": points changed from " + targetPlayer.getWorldChatPoints() + " to " + valueToken);
targetPlayer.setWorldChatPoints(Integer.parseInt(valueToken));
if (Config.ENABLE_WORLD_CHAT)
{
targetPlayer.sendPacket(new ExWorldChatCnt(targetPlayer));
}
break;
}
default:

View File

@ -47,6 +47,11 @@ public final class ChatWorld implements IChatHandler
@Override
public void handleChat(ChatType type, L2PcInstance activeChar, String target, String text)
{
if (!Config.ENABLE_WORLD_CHAT)
{
return;
}
final Instant now = Instant.now();
if (!REUSE.isEmpty())
{

View File

@ -471,6 +471,7 @@ public final class Config
public static int PEACE_ZONE_MODE;
public static String DEFAULT_GLOBAL_CHAT;
public static String DEFAULT_TRADE_CHAT;
public static boolean ENABLE_WORLD_CHAT;
public static int MINIMUM_CHAT_LEVEL;
public static boolean ALLOW_WAREHOUSE;
public static boolean WAREHOUSE_CACHE;
@ -1766,6 +1767,7 @@ public final class Config
PEACE_ZONE_MODE = General.getInt("PeaceZoneMode", 0);
DEFAULT_GLOBAL_CHAT = General.getString("GlobalChat", "ON");
DEFAULT_TRADE_CHAT = General.getString("TradeChat", "ON");
ENABLE_WORLD_CHAT = General.getBoolean("WorldChatEnabled", true);
MINIMUM_CHAT_LEVEL = General.getInt("MinimumChatLevel", 20);
ALLOW_WAREHOUSE = General.getBoolean("AllowWarehouse", true);
WAREHOUSE_CACHE = General.getBoolean("WarehouseCache", false);

View File

@ -188,6 +188,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
private void resetWorldChatPoints()
{
if (!Config.ENABLE_WORLD_CHAT)
{
return;
}
// Update data for offline players.
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE character_variables SET val = ? WHERE var = ?"))

View File

@ -641,7 +641,10 @@ public class EnterWorld implements IClientIncomingPacket
}
activeChar.sendPacket(new ExAcquireAPSkillList(activeChar));
if (Config.ENABLE_WORLD_CHAT)
{
activeChar.sendPacket(new ExWorldChatCnt(activeChar));
}
activeChar.sendPacket(new ExOneDayReceiveRewardList(activeChar));
activeChar.sendPacket(ExConnectedTimeAndGettableReward.STATIC_PACKET);

View File

@ -357,6 +357,10 @@ GlobalChat = ON
# Default: ON
TradeChat = ON
# World Chat.
# Default: True
WorldChatEnabled = True
# Minimum level for chat, 0 = disable
# Default: 20
MinimumChatLevel = 20

View File

@ -367,7 +367,10 @@ public class AdminAdmin implements IAdminCommandHandler
activeChar.sendMessage(targetPlayer.getName() + ": points changed from " + targetPlayer.getWorldChatPoints() + " to " + valueToken);
targetPlayer.setWorldChatPoints(Integer.parseInt(valueToken));
if (Config.ENABLE_WORLD_CHAT)
{
targetPlayer.sendPacket(new ExWorldChatCnt(targetPlayer));
}
break;
}
default:

View File

@ -47,6 +47,11 @@ public final class ChatWorld implements IChatHandler
@Override
public void handleChat(ChatType type, L2PcInstance activeChar, String target, String text)
{
if (!Config.ENABLE_WORLD_CHAT)
{
return;
}
final Instant now = Instant.now();
if (!REUSE.isEmpty())
{

View File

@ -471,6 +471,7 @@ public final class Config
public static int PEACE_ZONE_MODE;
public static String DEFAULT_GLOBAL_CHAT;
public static String DEFAULT_TRADE_CHAT;
public static boolean ENABLE_WORLD_CHAT;
public static int MINIMUM_CHAT_LEVEL;
public static boolean ALLOW_WAREHOUSE;
public static boolean WAREHOUSE_CACHE;
@ -1766,6 +1767,7 @@ public final class Config
PEACE_ZONE_MODE = General.getInt("PeaceZoneMode", 0);
DEFAULT_GLOBAL_CHAT = General.getString("GlobalChat", "ON");
DEFAULT_TRADE_CHAT = General.getString("TradeChat", "ON");
ENABLE_WORLD_CHAT = General.getBoolean("WorldChatEnabled", true);
MINIMUM_CHAT_LEVEL = General.getInt("MinimumChatLevel", 20);
ALLOW_WAREHOUSE = General.getBoolean("AllowWarehouse", true);
WAREHOUSE_CACHE = General.getBoolean("WarehouseCache", false);

View File

@ -188,6 +188,11 @@ public class DailyTaskManager extends AbstractEventManager<AbstractEvent<?>>
private void resetWorldChatPoints()
{
if (!Config.ENABLE_WORLD_CHAT)
{
return;
}
// Update data for offline players.
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE character_variables SET val = ? WHERE var = ?"))

View File

@ -641,7 +641,10 @@ public class EnterWorld implements IClientIncomingPacket
}
activeChar.sendPacket(new ExAcquireAPSkillList(activeChar));
if (Config.ENABLE_WORLD_CHAT)
{
activeChar.sendPacket(new ExWorldChatCnt(activeChar));
}
activeChar.sendPacket(new ExOneDayReceiveRewardList(activeChar));
activeChar.sendPacket(ExConnectedTimeAndGettableReward.STATIC_PACKET);