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

Attempt to fix knockbackvelocity.

Browse Source 
* Use positive vy always.
* Use full force along horizontal axis always.
* (Always apply, because events only fire when they count.)
This commit is contained in:
asofold 2015-01-13 23:01:01 +01:00
parent 0560daa16f
commit cf006ff6d6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import org.bukkit.event.player.PlayerItemHeldEvent;
import org.bukkit.event.player.PlayerToggleSprintEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.util.Vector;
import fr.neatmonster.nocheatplus.NCPAPIProvider;
import fr.neatmonster.nocheatplus.checks.CheckListener;
@ -554,20 +553,15 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
// Cap the level to something reasonable. TODO: Config.
level = Math.min(20.0, level);
// TODO: How is the direction really calculated?
final Vector dir = attacker.getLocation(useLoc1).getDirection().multiply(0.5 * level);
double vy = dir.getY();
if (BlockProperties.isOnGround(damagedPlayer, damagedPlayer.getLocation(useLoc1), mcc.yOnGround)) {
// (Re-used useLoc1 without need for cleanup.)
// TODO: What here ?
// vy = Math.max(vy, 0.365);
vy = 0.365;
}
// Aim at sqrt(vx * vx + vz * vz, 2), not the exact direction.
final double vx = Math.sqrt(0.125 * level * level);
final double vz = Math.sqrt(0.125 * level * level);
final double vy = 0.365;
useLoc1.setWorld(null); // Cleanup.
if (damagedData.debug || mdata.debug) {
NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, damagedPlayer.getName() + " received knockback level: " + level);
}
mdata.addVelocity(damagedPlayer, mcc, dir.getX(), vy, dir.getZ());
mdata.addVelocity(damagedPlayer, mcc, vx, vy, vz);
}
/**