From 3b65160552466df46c5270494bd3ed354d001522 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Fri, 29 Dec 2023 01:58:58 +0300 Subject: [PATCH] tweaked minecarts + AddEntityPacket --- src/Player.php | 6 +++--- src/entity/Entity.php | 7 +------ src/entity/object/Arrow.php | 7 ------- src/entity/object/PrimedTNT.php | 5 +---- src/material/block/nonfull/RailBlock.php | 8 ++++---- src/network/protocol/packet/AddEntityPacket.php | 6 +++--- src/network/protocol/packet/PlayerInputPacket.php | 10 +++++----- 7 files changed, 17 insertions(+), 32 deletions(-) diff --git a/src/Player.php b/src/Player.php index 9dc50e4f..186d4e80 100755 --- a/src/Player.php +++ b/src/Player.php @@ -2271,9 +2271,9 @@ class Player{ if($this->entity->linkedEntity instanceof Entity){ $pk = new SetEntityMotionPacket; $pk->eid = $this->entity->linkedEntity->eid; - $pk->speedX = ($this->entity->x - $this->entity->linkedEntity->x)*30; - $pk->speedY = ($this->entity->y - $this->entity->linkedEntity->y)*30; - $pk->speedZ = ($this->entity->z - $this->entity->linkedEntity->z)*30; + $pk->speedX = ($this->entity->x - $this->entity->linkedEntity->x)*1.2; + $pk->speedY = ($this->entity->y - $this->entity->linkedEntity->y)*1.2; + $pk->speedZ = ($this->entity->z - $this->entity->linkedEntity->z)*1.2; foreach($this->level->players as $p){ if($p->entity->eid != $this->entity->eid){ $p->dataPacket(clone $pk); diff --git a/src/entity/Entity.php b/src/entity/Entity.php index f19480c9..d55f6646 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1016,16 +1016,11 @@ class Entity extends Position $pk->x = $this->x; $pk->y = $this->y; $pk->z = $this->z; - $pk->did = - $this->data["Tile"]; - $player->dataPacket($pk); - - $pk = new SetEntityMotionPacket(); - $pk->eid = $this->eid; $pk->speedX = $this->speedX; $pk->speedY = $this->speedY; $pk->speedZ = $this->speedZ; + $pk->did = -$this->data["Tile"]; $player->dataPacket($pk); - break; } } diff --git a/src/entity/object/Arrow.php b/src/entity/object/Arrow.php index 5b1bc4e7..22ecc09d 100644 --- a/src/entity/object/Arrow.php +++ b/src/entity/object/Arrow.php @@ -144,13 +144,6 @@ class Arrow extends Projectile{ $pk->speedY = $this->speedY; $pk->speedZ = $this->speedZ; $player->dataPacket($pk); - - $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; - $player->dataPacket($pk); } } } \ No newline at end of file diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php index 6310663e..ca9cb62b 100644 --- a/src/entity/object/PrimedTNT.php +++ b/src/entity/object/PrimedTNT.php @@ -48,10 +48,7 @@ class PrimedTNT extends Entity{ $pk->x = $this->x; $pk->y = $this->y; $pk->z = $this->z; - $pk->did = 0; - $player->dataPacket($pk); - $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; + $pk->did = 1; $pk->speedX = $this->speedX; $pk->speedY = $this->speedY; $pk->speedZ = $this->speedZ; diff --git a/src/material/block/nonfull/RailBlock.php b/src/material/block/nonfull/RailBlock.php index 4fdc41a7..fb739ef9 100644 --- a/src/material/block/nonfull/RailBlock.php +++ b/src/material/block/nonfull/RailBlock.php @@ -9,10 +9,10 @@ class RailBlock extends RailBaseBlock{ } public function updateState(){ - //$logic = (new RailLogic($this)); - //if($logic->countPotentialConnections() == 3){ - // $logic->place(false, false); - //} + $logic = (new RailLogic($this)); + if($logic->countPotentialConnections() == 3){ + $logic->place(false, false); + } } } \ No newline at end of file diff --git a/src/network/protocol/packet/AddEntityPacket.php b/src/network/protocol/packet/AddEntityPacket.php index 52d1e2b8..ac2c1a75 100644 --- a/src/network/protocol/packet/AddEntityPacket.php +++ b/src/network/protocol/packet/AddEntityPacket.php @@ -28,9 +28,9 @@ class AddEntityPacket extends RakNetDataPacket{ $this->putFloat($this->z); $this->putInt($this->did); if($this->did > 0){ - $this->putShort($this->speedX); - $this->putShort($this->speedY); - $this->putShort($this->speedZ); + $this->putShort((int)($this->speedX * 8000)); + $this->putShort((int)($this->speedY * 8000)); + $this->putShort((int)($this->speedZ * 8000)); } } diff --git a/src/network/protocol/packet/PlayerInputPacket.php b/src/network/protocol/packet/PlayerInputPacket.php index af3a5e94..f80f18bc 100644 --- a/src/network/protocol/packet/PlayerInputPacket.php +++ b/src/network/protocol/packet/PlayerInputPacket.php @@ -1,6 +1,6 @@ unk1 = $this->getFloat(); - $this->unk2 = $this->getFloat(); - $this->sneaking = bin2hex($this->buffer)[$this->getOffset()] === 4; - $this->unk4 = bin2hex($this->buffer)[$this->getOffset()+1] === 4; + $this->moveStrafe = $this->getFloat(); + $this->moveForward = $this->getFloat(); + $this->isJumping = $this->getByte() != 0; + $this->isSneaking = $this->getByte() != 0; } }