From 73a36a1ea29289455adcd2993c7ce53672b7e239 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Tue, 30 Apr 2024 22:02:10 +0300 Subject: [PATCH] very bad fix of invalid client ent position while it is on half blocks --- src/Player.php | 10 +++++++++- src/entity/Entity.php | 12 +++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Player.php b/src/Player.php index 56f54447..abee9b01 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1230,7 +1230,10 @@ class Player{ $motionSent = false; $moveSent = false; $headSent = false; - + $svdYSpeed = $e->speedY; + if($e->modifySpeedY){ + $e->speedY = $e->modifedSpeedY; + } if($e->speedX != 0 || $e->speedY != 0 || $e->speedZ != 0 || $e->speedY != $e->lastSpeedY || $e->speedX != $e->lastSpeedX || $e->speedZ != $e->lastSpeedZ){ if(!($e->speedY < 0 && $e->onGround) || $e->speedX != 0 || $e->speedZ != 0 || $e->speedY != $e->lastSpeedY || $e->speedX != $e->lastSpeedX || $e->speedZ != $e->lastSpeedZ){ $motion = new SetEntityMotionPacket(); @@ -1244,6 +1247,11 @@ class Player{ $motionSent = true; } } + if($e->modifySpeedY){ + $e->speedY = $svdYSpeed; + $e->modifySpeedY = false; + } + if($e->x != $e->lastX || $e->y != $e->lastY || $e->z != $e->lastZ || $e->yaw != $e->lastYaw || $e->pitch != $e->lastPitch){ if($e->headYaw != $e->lastHeadYaw){ $move = new MovePlayerPacket(); diff --git a/src/entity/Entity.php b/src/entity/Entity.php index e081502c..7c56d2d9 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -8,7 +8,8 @@ class Entity extends Position const MIN_POSSIBLE_SPEED = 1/8000; //anything below will send 0 to player public $searchForClosestPlayers = false; - + public $modifySpeedY = false; + public $modifedSpeedY = 0.0; public $counter = 0; public $fallDistance = 0; public static $updateOnTick, $allowedAI; @@ -631,18 +632,15 @@ class Entity extends Position } $this->boundingBox->offset(0, 0, $dz); - $dy = -$this->stepHeight; - foreach($aaBBs as $bb){ - $dy = $bb->calculateYOffset($this->boundingBox, $dy); - } - $this->boundingBox->offset(0, $dy, 0); - if ($cx*$cx + $cz*$cz >= $dx*$dx + $dz*$dz) { $dx = $cx; $dy = $cy; $dz = $cz; $this->boundingBox->setBB($aabb1); + }else{ + $this->modifySpeedY = true; + $this->modifedSpeedY = 0.5; } }