From b959b812cf25ca85fd81792e29d417e2a7f6ad6b Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 29 Jan 2023 17:43:14 +0300 Subject: [PATCH] fixed setentitylink packet --- src/Player.php | 13 +++++++++++++ src/entity/Entity.php | 10 +++------- src/network/protocol/packet/SetEntityLinkPacket.php | 6 +++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/Player.php b/src/Player.php index 5305c688..9b05ae56 100755 --- a/src/Player.php +++ b/src/Player.php @@ -668,6 +668,17 @@ class Player{ */ public function eventHandler($data, $event){ switch($event){ + case "entity.link": + $pk = new SetEntityLinkPacket(); + if($data["rider"] === $this->eid){ + $pk->rider = 0; + }else{ + $pk->rider = $data["rider"]; + } + $pk->riding = $data["riding"]; + $pk->type = 0; //TODO; + $this->dataPacket($pk); + break; case "tile.update": if($data->level === $this->level){ if($data->class === TILE_FURNACE){ @@ -1425,11 +1436,13 @@ class Player{ $this->evid[] = $this->server->event("entity.animate", [$this, "eventHandler"]); $this->evid[] = $this->server->event("entity.event", [$this, "eventHandler"]); $this->evid[] = $this->server->event("entity.metadata", [$this, "eventHandler"]); + $this->evid[] = $this->server->event("entity.link", [$this, "eventHandler"]); $this->evid[] = $this->server->event("player.equipment.change", [$this, "eventHandler"]); $this->evid[] = $this->server->event("player.armor", [$this, "eventHandler"]); $this->evid[] = $this->server->event("player.pickup", [$this, "eventHandler"]); $this->evid[] = $this->server->event("tile.container.slot", [$this, "eventHandler"]); $this->evid[] = $this->server->event("tile.update", [$this, "eventHandler"]); + $this->lastMeasure = microtime(true); $this->server->schedule(50, [$this, "measureLag"], [], true); console("[INFO] " . FORMAT_AQUA . $this->username . FORMAT_RESET . "[/" . $this->ip . ":" . $this->port . "] logged in with entity id " . $this->eid . " at (" . $this->entity->level->getName() . ", " . round($this->entity->x, 2) . ", " . round($this->entity->y, 2) . ", " . round($this->entity->z, 2) . ")"); diff --git a/src/entity/Entity.php b/src/entity/Entity.php index eb38ecc3..9b61b1f4 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1319,13 +1319,9 @@ class Entity extends Position public function linkEntity(Entity $e, $type) { - if($e->isPlayer()){ - $pk = new SetEntityLinkPacket(); - $pk->rider = $this->eid; - $pk->riding = $type === SetEntityLinkPacket::TYPE_REMOVE ? 0 : $e->eid; - $pk->type = $type; - $e->player->dataPacket($pk); - } + //if($e->isPlayer()){ + $this->server->api->dhandle("entity.link", ["rider" => $e->eid, "riding" => $this->eid, "type" => 0]); + //} } public function isPlayer() diff --git a/src/network/protocol/packet/SetEntityLinkPacket.php b/src/network/protocol/packet/SetEntityLinkPacket.php index 87917853..34de37c1 100644 --- a/src/network/protocol/packet/SetEntityLinkPacket.php +++ b/src/network/protocol/packet/SetEntityLinkPacket.php @@ -16,9 +16,9 @@ class SetEntityLinkPacket extends RakNetDataPacket{ } public function encode() { $this->reset(); - $this->putLong($this->rider); - $this->putLong($this->riding); - $this->putByte($this->type); + $this->putInt($this->rider); + $this->putInt($this->riding); + $this->putInt($this->type); }