Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-05 03:31:09 +02:00
Code Issues Projects Releases Wiki Activity

Fix LogAction.getOptimizedCopy returning something that logs nothing.

Browse Source
This commit is contained in:
asofold 2014-11-06 00:47:59 +01:00
parent 9a6bb37bd8
commit 881bd44330
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/LogAction.java
View File

@ -99,9 +99,15 @@ public class LogAction extends ActionWithParameters<ViolationData, ActionList> {
public boolean execute(final ViolationData violationData) { public boolean execute(final ViolationData violationData) {
if (!violationData.player.hasPermission(violationData.getPermissionSilent())) { if (!violationData.player.hasPermission(violationData.getPermissionSilent())) {
final String message = super.getMessage(violationData); final String message = super.getMessage(violationData);
if (toChat) NCPAPIProvider.getNoCheatPlusAPI().sendAdminNotifyMessage(ColorUtil.replaceColors(prefixChat + message)); if (toChat) {
if (toConsole) LogUtil.logInfo(ColorUtil.removeColors(prefixConsole + message)); NCPAPIProvider.getNoCheatPlusAPI().sendAdminNotifyMessage(ColorUtil.replaceColors(prefixChat + message));
if (toFile) StaticLogFile.fileLogger.info(ColorUtil.removeColors(prefixFile + message)); }
if (toConsole) {
LogUtil.logInfo(ColorUtil.removeColors(prefixConsole + message));
}
if (toFile) {
StaticLogFile.fileLogger.info(ColorUtil.removeColors(prefixFile + message));
}
} }
return false; return false;
} }
@ -119,27 +125,31 @@ public class LogAction extends ActionWithParameters<ViolationData, ActionList> {
@Override @Override
public Action<ViolationData, ActionList> getOptimizedCopy(final ConfigFileWithActions<ViolationData, ActionList> config, final Integer threshold) { public Action<ViolationData, ActionList> getOptimizedCopy(final ConfigFileWithActions<ViolationData, ActionList> config, final Integer threshold) {
if (!config.getBoolean(ConfPaths.LOGGING_ACTIVE)) return null; if (!config.getBoolean(ConfPaths.LOGGING_ACTIVE)) {
return null;
}
final String prefixChat = filterPrefix(config, ConfPaths.LOGGING_BACKEND_INGAMECHAT_PREFIX, PREFIX_CHAT, this.toChat && config.getBoolean(ConfPaths.LOGGING_BACKEND_INGAMECHAT_ACTIVE)); final String prefixChat = filterPrefix(config, ConfPaths.LOGGING_BACKEND_INGAMECHAT_PREFIX, PREFIX_CHAT, this.toChat && config.getBoolean(ConfPaths.LOGGING_BACKEND_INGAMECHAT_ACTIVE));
final String prefixConsole = filterPrefix(config, ConfPaths.LOGGING_BACKEND_CONSOLE_PREFIX, PREFIX_CONSOLE, this.toConsole && config.getBoolean(ConfPaths.LOGGING_BACKEND_CONSOLE_ACTIVE)); final String prefixConsole = filterPrefix(config, ConfPaths.LOGGING_BACKEND_CONSOLE_PREFIX, PREFIX_CONSOLE, this.toConsole && config.getBoolean(ConfPaths.LOGGING_BACKEND_CONSOLE_ACTIVE));
final String prefixFile = filterPrefix(config, ConfPaths.LOGGING_BACKEND_FILE_PREFIX, PREFIX_FILE, this.toFile && config.getBoolean(ConfPaths.LOGGING_BACKEND_FILE_ACTIVE)); final String prefixFile = filterPrefix(config, ConfPaths.LOGGING_BACKEND_FILE_PREFIX, PREFIX_FILE, this.toFile && config.getBoolean(ConfPaths.LOGGING_BACKEND_FILE_ACTIVE));
if (allNull(toChat, toConsole, toFile)){ if (allNull(prefixChat, prefixConsole, prefixFile)) {
return null; return null;
} }
return new LogAction(name, delay, repeat, prefixChat, prefixConsole, prefixFile, message); return new LogAction(name, delay, repeat, prefixChat, prefixConsole, prefixFile, message);
} }
private static boolean allNull(Object... objects){ private static boolean allNull(Object... objects) {
for (int i = 0; i < objects.length; i++){ for (int i = 0; i < objects.length; i++) {
if (objects[i] != null){ if (objects[i] != null) {
return false; return false;
} }
} }
return true; return true;
} }
private static final String filterPrefix(final ConfigFileWithActions<ViolationData, ActionList> config, final String path, final String defaultValue, final boolean use){ private static final String filterPrefix(final ConfigFileWithActions<ViolationData, ActionList> config, final String path, final String defaultValue, final boolean use) {
if (!use) return null; if (!use) {
return null;
}
final String prefix = config.getString(path); final String prefix = config.getString(path);
return prefix == null ? defaultValue : prefix; return prefix == null ? defaultValue : prefix;
} }