Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-03-11 22:20:52 +01:00
Code Issues Projects Releases Wiki Activity

Fight: more debug logging, confine thorns workaround.

Browse Source
This commit is contained in:
asofold 2016-03-17 09:16:05 +01:00
parent f3d4941a6f
commit bbf3baa9ff
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
View File

@ -187,6 +187,12 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
//damagedTrace.addEntry(tick, damagedLoc.getX(), damagedLoc.getY(), damagedLoc.getZ());
}
// Log generic properties of this attack.
if (data.debug) {
debug(player, "Attacks " + (damagedPlayer == null ? ("entity " + damaged.getType()) : ("player" + damagedPlayer.getName())) + " damage=" + damage);
}
// Can't fight dead.
if (cc.cancelDead){
if (damaged.isDead()) {
cancelled = true;
@ -197,7 +203,10 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
}
}
if (damage <= 4.0 && tick == data.damageTakenByEntityTick && data.thornsId != Integer.MIN_VALUE && data.thornsId == damaged.getEntityId()){
// TODO: 1.9: sweep attack.
// LEGACY: thorns.
if (BridgeHealth.DAMAGE_THORNS == null && damage <= 4.0 && tick == data.damageTakenByEntityTick && data.thornsId != Integer.MIN_VALUE && data.thornsId == damaged.getEntityId()){
// Don't handle further, but do respect selfhit/canceldead.
// TODO: Remove soon, at least version-dependent.
data.thornsId = Integer.MIN_VALUE;
@ -247,7 +256,7 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
if (reachEnabled || directionEnabled) {
if (damagedTrace != null) {
// Checks that use the LocationTrace instance of the attacked entity/player.
cancelled = locationTraceChecks(player, loc, data, cc, damaged, damagedLoc, damagedTrace, tick, reachEnabled, directionEnabled);
cancelled = locationTraceChecks(player, loc, data, cc, damaged, damagedLoc, damagedTrace, tick, now, reachEnabled, directionEnabled);
} else {
// Still use the classic methods for non-players. maybe[]
if (reachEnabled && reach.check(player, loc, damaged, damagedLoc, data, cc)) {
@ -347,7 +356,9 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
* @param directionEnabled
* @return If to cancel (true) or not (false).
*/
private boolean locationTraceChecks(Player player, Location loc, FightData data, FightConfig cc, Entity damaged, Location damagedLoc, LocationTrace damagedTrace, long tick, boolean reachEnabled, boolean directionEnabled) {
private boolean locationTraceChecks(final Player player, final Location loc, final FightData data, final FightConfig cc,
final Entity damaged, final Location damagedLoc, LocationTrace damagedTrace,
final long tick, final long now, final boolean reachEnabled, final boolean directionEnabled) {
// TODO: Order / splitting off generic stuff.
boolean cancelled = false;
@ -365,6 +376,7 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
boolean directionPassed = !directionEnabled; // Passed individually for some tick.
// TODO: Maintain a latency estimate + max diff and invalidate completely (i.e. iterate from latest NEXT time)], or just max latency.
// TODO: Consider a max-distance to "now", for fast invalidation.
long latencyEstimate = -1;
while (traceIt.hasNext()) {
final TraceEntry entry = traceIt.next();
// Simplistic just check both until end or hit.
@ -388,6 +400,7 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
if (thisPassed) {
// TODO: Log/set estimated latency.
violation = false;
latencyEstimate = now - entry.time;
break;
}
}
@ -407,6 +420,9 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
}
}
// TODO: Log exact state, probably record min/max latency (individually).
if (data.debug && latencyEstimate >= 0) {
debug(player, "Latency estimate: " + latencyEstimate + " ms."); // FCFS rather, at present.
}
return cancelled;
}

13
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/BridgeHealth.java
View File

@ -25,7 +25,18 @@ import fr.neatmonster.nocheatplus.utilities.ReflectionUtil;
public class BridgeHealth {
/** For debugging purposes. TODO: Reset on shutdown !? */
private static Set<String> failures = new HashSet<String>();
private static Set<String> failures = new HashSet<String>();
private static DamageCause getDamageCause(String name) {
try {
return DamageCause.valueOf(name);
} catch (Throwable t) {
// ouch.
return null;
}
}
public static final DamageCause DAMAGE_THORNS = getDamageCause("THORNS");
/**
* This method is meant to be called on API that changed from int to double.<br>