Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-21 23:51:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix knockback

Browse Source
This commit is contained in:
Németh Noel 2021-06-28 19:23:36 +02:00
parent 1ea526aa89
commit 13779aabde
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -1748,9 +1748,10 @@ public class Entity implements Viewable, Tickable, EventHandler<EntityEvent>, Da
*/ */
public void takeKnockback(final float strength, final double x, final double z) { public void takeKnockback(final float strength, final double x, final double z) {
if (strength > 0) { if (strength > 0) {
final Vector velocityModifier = new Vector(x, 0d, z).normalize().multiply(strength); //TODO check possible side effects of unnatural TPS (other than 20TPS)
final Vector velocityModifier = new Vector(x, 0d, z).normalize().multiply(strength * MinecraftServer.TICK_PER_SECOND / 2);
this.velocity.setX(velocity.getX() / 2d - velocityModifier.getX()); this.velocity.setX(velocity.getX() / 2d - velocityModifier.getX());
this.velocity.setY(onGround ? Math.min(.4d, velocity.getY() / 2d + strength) : velocity.getY()); this.velocity.setY(onGround ? Math.min(.4d, velocity.getY() / 2d + strength) * MinecraftServer.TICK_PER_SECOND : velocity.getY());
this.velocity.setZ(velocity.getZ() / 2d - velocityModifier.getZ()); this.velocity.setZ(velocity.getZ() / 2d - velocityModifier.getZ());
} }
} }