mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
fixed setentitylink packet
This commit is contained in:
parent
81af4a9b45
commit
b959b812cf
3 changed files with 19 additions and 10 deletions
|
|
@ -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) . ")");
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue