diff --git a/src/Player.php b/src/Player.php index 157a9d32..442fb7b8 100755 --- a/src/Player.php +++ b/src/Player.php @@ -2165,6 +2165,22 @@ class Player{ $this->entity->linkedEntity->linkedEntity = false; $this->entity->linkedEntity = false; } + if($this->entity->linkedEntity instanceof Entity){ + $pk = new SetEntityMotionPacket; + $pk->eid = $this->entity->linkedEntity->eid; + var_dump($packet); + $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; + foreach($this->level->players as $p){ + if($p->entity->eid != $this->entity->eid){ + $p->dataPacket(clone $pk); + } + } + + $this->entity->linkedEntity->setPosition($this->entity); + $this->entity->linkedEntity->sendMoveUpdate(); + } break; //TODO player input- default: diff --git a/src/entity/object/Minecart.php b/src/entity/object/Minecart.php index d4bc1915..f154bf25 100644 --- a/src/entity/object/Minecart.php +++ b/src/entity/object/Minecart.php @@ -2,10 +2,59 @@ class Minecart extends Vehicle{ const TYPE = OBJECT_MINECART; - private $moveVector = []; - const STATE_INITIAL = 0; - const STATE_ON_RAIL = 1; - const STATE_OFF_RAIL = 2; + /** + * A minecart rotation matrix + * @var int[][][] + */ + private static $matrix = [ + [ + [0, 0, -1], + [0, 0, 1] + ], + [ + [-1, 0, 0], + [1, 0, 0] + ], + [ + [-1, -1, 0], + [1, 0, 0] + ], + [ + [-1, 0, 0], + [1, -1, 0] + ], + [ + [0, 0, -1], + [0, -1, 1] + ], + [ + [0, -1, -1], + [0, 0, 1] + ], + [ + [0, 0, 1], + [1, 0, 0] + ], + [ + [0, 0, 1], + [-1, 0, 0] + ], + [ + [0, 0, -1], + [-1, 0, 0] + ], + [ + [0, 0, -1], + [1, 0, 0] + ] + ]; + + private $hurtTime = 0; //syncentdata 17 int + private $damage = 0; //syncentdata 19 float + + private $minecartX = 0, $minecartY = 0, $minecartZ = 0; + private $turnProgress = 0; + function __construct(Level $level, $eid, $class, $type = 0, $data = []){ parent::__construct($level, $eid, $class, $type, $data); @@ -14,12 +63,8 @@ class Minecart extends Vehicle{ $this->y = isset($this->data["TileY"]) ? $this->data["TileY"]:$this->y; $this->z = isset($this->data["TileZ"]) ? $this->data["TileZ"]:$this->z; $this->setHealth(3, "generic"); - //$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type)); - $this->width = 1; - /*$this->moveVector[Entity::NORTH] = new Vector3(-1, 0, 0); - $this->moveVector[Entity::SOUTH] = new Vector3(1, 0, 0); - $this->moveVector[Entity::EAST] = new Vector3(0, 0, -1); - $this->moveVector[Entity::WEST] = new Vector3(0, 0, 1);*/ + $this->width = 0.98; + $this->height = 0.7; $this->update(); } @@ -63,7 +108,6 @@ class Minecart extends Vehicle{ } parent::interactWith($e, $action); } - public function canRide($e) { return !($this->linkedEntity instanceof Entity) && !$e->isRiding;