From 78a19a7da61ce2f5a1976b5dec68f51581bb1185 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Wed, 5 Jul 2023 10:10:06 +0300 Subject: [PATCH] bow power algorithm is implemented(statically set to 1sec before launch now), direct arrow move updates sending --- src/Player.php | 21 ++++++++++++++++++++- src/entity/object/Arrow.php | 15 ++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/Player.php b/src/Player.php index 494b9588..50054c24 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1726,7 +1726,26 @@ class Player{ $e->speedX = -sin(($e->yaw / 180) * M_PI) * cos(($e->pitch / 180) * M_PI); $e->speedZ = cos(($e->yaw / 180) * M_PI) * cos(($e->pitch / 180) * M_PI); $e->speedY = -sin(($e->pitch / 180) * M_PI); - $e->shoot($e->speedX, $e->speedY, $e->speedZ, 1.5, 1.5); //TODO bow power + + /** + * Max usage: 72000ticks + * initalPower = 72000 - (72000 - usedCtr) + * power = initialPower / 20' + * power = (power*power+power*2)/3 + * powerMax is 1, powerMin is 0.1 + * args: xvel, yvel, zvel, (power+power)*1.5, 1.0 + */ + + $initalPower = 72000 - (72000 - 20); //assume we used a bow for 1 second + $power = $initalPower / 20; + $power = ($power * $power + $power * 2) / 3; + if($power > 1.0) $power = 1; + elseif($power < 0.1){ + //CANCEL but i am too lazy + $power = 0.1; + } + + $e->shoot($e->speedX, $e->speedY, $e->speedZ, ($power+$power) * 1.5, 1.0); //TODO bow power $this->server->api->entity->spawnToAll($e); } } diff --git a/src/entity/object/Arrow.php b/src/entity/object/Arrow.php index 2bee1563..c7aae0cb 100644 --- a/src/entity/object/Arrow.php +++ b/src/entity/object/Arrow.php @@ -41,7 +41,20 @@ class Arrow extends Projectile{ $this->update(); //TODO i guess? $ticksInGround = 0; } - + public function sendMoveUpdate() + { + $pk = new MoveEntityPacket_PosRot(); + $pk->eid = $this->eid; + $pk->x = $this->x; + $pk->y = $this->y; + $pk->z = $this->z; + $pk->yaw = $this->yaw; + $pk->pitch = $this->pitch; + + foreach($this->level->players as $p){ //sending packets directly makes movement less laggy + $p->directDataPacket(clone $pk); + } + } public function update(){ //parent::update(); $this->needsUpdate = true;