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

Completely bind yawrate check to angle check (includes exemption).

Browse Source
This commit is contained in:
asofold 2012-09-30 16:12:25 +02:00
parent 4a26f741df
commit 66f6d2d072
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
View File

@ -121,11 +121,6 @@ public class FightListener implements Listener {
final long now = System.currentTimeMillis();
final boolean worldChanged = !worldName.equals(data.lastWorld);
// Improbable yaw:
if (Combined.checkYawRate(player, player.getLocation().getYaw(), now, worldName, cc.yawRateCheck && !player.hasPermission(Permissions.FIGHT_ANGLE))){
cancelled = true;
}
// Get the attacked entity.
final net.minecraft.server.Entity damaged = ((CraftEntity) cbEntity).getHandle();
@ -140,8 +135,19 @@ public class FightListener implements Listener {
}
if (!cancelled && angle.isEnabled(player) && angle.check(player, worldChanged))
cancelled = true;
if (!cancelled && angle.isEnabled(player)){
// Improbable yaw.
if (Combined.checkYawRate(player, player.getLocation().getYaw(), now, worldName, cc.yawRateCheck)){
// (Check or just feed).
cancelled = true;
}
// Angle check.
if (angle.check(player, worldChanged)) cancelled = true;
}
else{
// Always feed yaw rate here.
Combined.feedYawRate(player, player.getLocation().getYaw(), now, worldName);
}
if (!cancelled && critical.isEnabled(player) && critical.check(player))
cancelled = true;