diff --git a/src/player/Player.php b/src/player/Player.php
index ab348d899..f8efbcba8 100644
--- a/src/player/Player.php
+++ b/src/player/Player.php
@@ -1779,9 +1779,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 		if($ev->isCancelled()){
 			return false;
 		}
-		//don't use setFlying() here, to avoid feedback loops - TODO: get rid of this hack
-		$this->flying = $fly;
-		$this->resetFallDistance();
+		$this->setFlying($fly);
 		return true;
 	}