Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Support setting values for any ParameterName key explicitly.

Browse Source 
Previously the "dynamically" evaluated result would always have been
used, even if a value had been set explicitly before execution of
actions.
This commit is contained in:
asofold 2017-04-14 19:40:30 +02:00
parent 23f9ac5689
commit f262a831b0
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/ViolationData.java
View File

@ -249,10 +249,30 @@ public class ViolationData implements IViolationInfo, ActionData {
if (parameterName == null) {
return "<???>";
}
String value = null;
if (parameters != null) {
value = parameters.get(parameterName);
}
if (value == null) {
value = getImplicitValue(parameterName);
}
// If null, return what would have been parsed to get the parameter.
return (value == null) ? ("[" + parameterName.getText() + "]") : value;
}
/**
* Evaluate parameters that are supported to be fetched, even if no
* parameters have been set explicitly.
*
* @param parameterName
* @return
*/
private String getImplicitValue(final ParameterName parameterName) {
switch (parameterName) {
case CHECK:
return check.getClass().getSimpleName();
case HEALTH: {
// Not optimal to get dynamically if the ViolationData is created off the primary thread.
String health = getParameterValue(ParameterName.HEALTH);
return health == null ? (BridgeHealth.getHealth(player) + "/" + BridgeHealth.getMaxHealth(player)) : health;
}
@ -272,14 +292,8 @@ public class ViolationData implements IViolationInfo, ActionData {
return world == null ? player.getWorld().getName() : world;
}
default:
break;
return null;
}
if (parameters == null) {
// Return what would have been parsed to get the parameter.
return "[" + parameterName.getText() + "]";
}
final String value = parameters.get(parameterName);
return(value == null) ? ("[" + parameterName.getText() + "]") : value;
}
private String getParameterValue(ParameterName parameterName) {