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

Ensure to reset the (mc) fall distance on ground.

Browse Source
This commit is contained in:
asofold 2015-07-23 22:19:59 +02:00
parent 06eecb704d
commit 135c89ca70
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/NoFall.java
View File

@ -36,7 +36,7 @@ public class NoFall extends Check {
* @param fallDistance * @param fallDistance
* @return * @return
*/ */
protected static final double getDamage(final float fallDistance){ protected static final double getDamage(final float fallDistance) {
return fallDistance - 3.0; return fallDistance - 3.0;
} }
@ -52,7 +52,7 @@ public class NoFall extends Check {
// final int yD = getDamage((float) (data.noFallMaxY - y)); // final int yD = getDamage((float) (data.noFallMaxY - y));
// final int maxD = Math.max(Math.max(pD, nfD), yD); // final int maxD = Math.max(Math.max(pD, nfD), yD);
final double maxD = estimateDamage(player, y, data); final double maxD = estimateDamage(player, y, data);
if (maxD >= 1.0){ if (maxD >= 1.0) {
// Damage to be dealt. // Damage to be dealt.
// TODO: more effects like sounds, maybe use custom event with violation added. // TODO: more effects like sounds, maybe use custom event with violation added.
if (data.debug) { if (data.debug) {
@ -62,7 +62,10 @@ public class NoFall extends Check {
data.noFallSkipAirCheck = true; data.noFallSkipAirCheck = true;
dealFallDamage(player, maxD); dealFallDamage(player, maxD);
} }
else data.clearNoFallData(); else {
data.clearNoFallData();
player.setFallDistance(0);
}
} }
/** /**
@ -78,9 +81,9 @@ public class NoFall extends Check {
private final void adjustFallDistance(final Player player, final double minY, final boolean reallyOnGround, final MovingData data, final MovingConfig cc) { private final void adjustFallDistance(final Player player, final double minY, final boolean reallyOnGround, final MovingData data, final MovingConfig cc) {
final float noFallFallDistance = Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - minY)); final float noFallFallDistance = Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - minY));
if (noFallFallDistance >= 3.0){ if (noFallFallDistance >= 3.0) {
final float fallDistance = player.getFallDistance(); final float fallDistance = player.getFallDistance();
if (noFallFallDistance - fallDistance >= 0.5f || noFallFallDistance >= 3.5f && noFallFallDistance < 3.5f){ if (noFallFallDistance - fallDistance >= 0.5f || noFallFallDistance >= 3.5f && noFallFallDistance < 3.5f) {
player.setFallDistance(noFallFallDistance); player.setFallDistance(noFallFallDistance);
} }
} }
@ -96,7 +99,7 @@ public class NoFall extends Check {
else { else {
final EntityDamageEvent event = BridgeHealth.getEntityDamageEvent(player, DamageCause.FALL, damage); final EntityDamageEvent event = BridgeHealth.getEntityDamageEvent(player, DamageCause.FALL, damage);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()){ if (!event.isCancelled()) {
// TODO: account for no damage ticks etc. // TODO: account for no damage ticks etc.
player.setLastDamageCause(event); player.setLastDamageCause(event);
mcAccess.dealFallDamage(player, BridgeHealth.getDamage(event)); mcAccess.dealFallDamage(player, BridgeHealth.getDamage(event));
@ -151,29 +154,37 @@ public class NoFall extends Check {
final double pY = loc.getY(); final double pY = loc.getY();
final double minY = Math.min(fromY, Math.min(toY, pY)); final double minY = Math.min(fromY, Math.min(toY, pY));
if (fromReset){ if (fromReset) {
// Just reset. // Just reset.
data.clearNoFallData(); data.clearNoFallData();
} }
else if (fromOnGround || data.noFallAssumeGround){ else if (fromOnGround || data.noFallAssumeGround) {
// Check if to deal damage (fall back damage check). // Check if to deal damage (fall back damage check).
if (cc.noFallDealDamage) handleOnGround(player, minY, true, data, cc); if (cc.noFallDealDamage) {
else adjustFallDistance(player, minY, true, data, cc); handleOnGround(player, minY, true, data, cc);
}
else {
adjustFallDistance(player, minY, true, data, cc);
}
} }
else if (toReset){ else if (toReset) {
// Just reset. // Just reset.
data.clearNoFallData(); data.clearNoFallData();
} }
else if (toOnGround){ else if (toOnGround) {
// Check if to deal damage. // Check if to deal damage.
if (yDiff < 0){ if (yDiff < 0) {
// In this case the player has traveled further: add the difference. // In this case the player has traveled further: add the difference.
data.noFallFallDistance -= yDiff; data.noFallFallDistance -= yDiff;
} }
if (cc.noFallDealDamage) handleOnGround(player, minY, true, data, cc); if (cc.noFallDealDamage) {
else adjustFallDistance(player, minY, true, data, cc); handleOnGround(player, minY, true, data, cc);
}
else {
adjustFallDistance(player, minY, true, data, cc);
}
} }
else{ else {
// Ensure fall distance is correct, or "anyway"? // Ensure fall distance is correct, or "anyway"?
} }
@ -187,25 +198,25 @@ public class NoFall extends Check {
data.noFallFallDistance = Math.max(mcFallDistance, data.noFallFallDistance); data.noFallFallDistance = Math.max(mcFallDistance, data.noFallFallDistance);
// Add y distance. // Add y distance.
if (!toReset && !toOnGround && yDiff < 0){ if (!toReset && !toOnGround && yDiff < 0) {
data.noFallFallDistance -= yDiff; data.noFallFallDistance -= yDiff;
} }
else if (cc.noFallAntiCriticals && (toReset || toOnGround || (fromReset || fromOnGround || data.noFallAssumeGround) && yDiff >= 0)){ else if (cc.noFallAntiCriticals && (toReset || toOnGround || (fromReset || fromOnGround || data.noFallAssumeGround) && yDiff >= 0)) {
final double max = Math.max(data.noFallFallDistance, mcFallDistance); final double max = Math.max(data.noFallFallDistance, mcFallDistance);
if (max > 0.0 && max < 0.75){ // (Ensure this does not conflict with deal-damage set to false.) if (max > 0.0 && max < 0.75) { // (Ensure this does not conflict with deal-damage set to false.)
if (data.debug){ if (data.debug) {
NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, player.getName() + " NoFall: Reset fall distance (anticriticals): mc=" + mcFallDistance +" / nf=" + data.noFallFallDistance); NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, player.getName() + " NoFall: Reset fall distance (anticriticals): mc=" + mcFallDistance +" / nf=" + data.noFallFallDistance);
} }
if (data.noFallFallDistance > 0){ if (data.noFallFallDistance > 0) {
data.noFallFallDistance = 0; data.noFallFallDistance = 0;
} }
if (mcFallDistance > 0){ if (mcFallDistance > 0f) {
player.setFallDistance(0); player.setFallDistance(0f);
} }
} }
} }
if (data.debug){ if (data.debug) {
NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, player.getName() + " NoFall: mc=" + mcFallDistance +" / nf=" + data.noFallFallDistance + (oldNFDist < data.noFallFallDistance ? " (+" + (data.noFallFallDistance - oldNFDist) + ")" : "") + " | ymax=" + data.noFallMaxY); NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, player.getName() + " NoFall: mc=" + mcFallDistance +" / nf=" + data.noFallFallDistance + (oldNFDist < data.noFallFallDistance ? " (+" + (data.noFallFallDistance - oldNFDist) + ")" : "") + " | ymax=" + data.noFallMaxY);
} }
@ -218,10 +229,10 @@ public class NoFall extends Check {
* @param cc * @param cc
*/ */
private void adjustYonGround(final PlayerLocation from, final PlayerLocation to, final double yOnGround) { private void adjustYonGround(final PlayerLocation from, final PlayerLocation to, final double yOnGround) {
if (!from.isOnGround()){ if (!from.isOnGround()) {
from.setyOnGround(yOnGround); from.setyOnGround(yOnGround);
} }
if (!to.isOnGround()){ if (!to.isOnGround()) {
to.setyOnGround(yOnGround); to.setyOnGround(yOnGround);
} }
} }