Merge branch 'master' of

https://git@github.com/NoCheatPlus/NoCheatPlus.git

Conflicts:
	src/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
This commit is contained in:
asofold 2012-11-06 10:01:21 +01:00
commit a88f69f164

View File

@ -320,7 +320,7 @@ public class SurvivalFly extends Check {
final boolean resetTo = toOnGround || to.isInLiquid() || to.isOnLadder()|| to.isInWeb();
// Accounting support.
if (cc.survivalFlyAccounting && !resetFrom && !resetTo) {
if (cc.survivalFlyAccounting && !resetFrom && !resetTo) {
// Currently only for "air" phases.
// Horizontal.
if (data.horizontalFreedom <= 0.001D){
@ -337,7 +337,7 @@ public class SurvivalFly extends Check {
// // Moving upwards without having touched the ground.
// vDistanceAboveLimit = Math.max(vDistanceAboveLimit, Math.abs(yDistance));
// tags.add("ychange");
// }
// }
}
}