1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index e40ba0bd..0d425ef0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -100,6 +100,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         entity.motX = vel.getX();
         entity.motY = vel.getY();
         entity.motZ = vel.getZ();
+        entity.aY = true;
     }
 
     public World getWorld() {
@@ -179,12 +180,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
     }
 
     public Vector getMomentum() {
-        return new Vector(entity.motX, entity.motY, entity.motZ);
+        return getVelocity();
     }
 
     public void setMomentum(Vector value) {
-        entity.motX = value.getX();
-        entity.motY = value.getY();
-        entity.motZ = value.getZ();
+        setVelocity(value);
     }
 }