From 6f6b15fa96bbcba55ecf20fb1df6f6c19cebcd4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9meth=20Noel?= <nemeth.noel@thekingsteam.tk>
Date: Wed, 7 Jul 2021 01:06:32 +0200
Subject: [PATCH] Update part of Entity.java

---
 .../net/minestom/server/entity/Entity.java    | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java
index fef4041a3..f406b7ef3 100644
--- a/src/main/java/net/minestom/server/entity/Entity.java
+++ b/src/main/java/net/minestom/server/entity/Entity.java
@@ -38,7 +38,6 @@ import net.minestom.server.tag.Tag;
 import net.minestom.server.tag.TagHandler;
 import net.minestom.server.thread.ThreadProvider;
 import net.minestom.server.utils.Position;
-import net.minestom.server.utils.Vector;
 import net.minestom.server.utils.callback.OptionalCallback;
 import net.minestom.server.utils.chunk.ChunkCallback;
 import net.minestom.server.utils.chunk.ChunkUtils;
@@ -549,27 +548,23 @@ public class Entity implements Viewable, Tickable, EventHandler<EntityEvent>, Da
                 }
 
                 // Update velocity
-                if (hasVelocity() || !newVelocity.isZero()) {
-                    this.velocity.copy(newVelocity);
-                    this.velocity.multiply(tps);
+                if (hasVelocity() || !newVelocity.equals(Vec.ZERO)) {
+                    velocity = newVelocity.mul(tps); // Convert from blocks/tick to blocks/sec
 
                     final Block block = finalChunk.getBlock(position);
                     final double drag = block.registry().friction();
                     if (onGround) {
                         // Stop player velocity
                         if (isNettyClient) {
-                            this.velocity.zero();
+                            velocity = Vec.ZERO;
                         }
                     }
 
-                    this.velocity.setX(velocity.getX() * drag);
-                    this.velocity.setZ(velocity.getZ() * drag);
-                    if (!hasNoGravity())
-                        this.velocity.setY(velocity.getY() * (1 - gravityDragPerTick));
-
-                    if (velocity.equals(new Vector())) {
-                        this.velocity.zero();
-                    }
+                    velocity = velocity.with((x, y, z) -> new Vec(
+                            x * drag,
+                            !hasNoGravity() ? y * (1 - gravityDragPerTick) : y,
+                            z * drag
+                    )).with(Vec.Operator.EPSILON);
                 }
 
                 // Synchronization and packets...