diff --git a/src/Player.php b/src/Player.php index 2b4a6c5e..6c53cf90 100755 --- a/src/Player.php +++ b/src/Player.php @@ -774,11 +774,8 @@ class Player{ if(($data->speedX === 0 && $data->speedY === 0 && $data->speedZ === 0) || ($data->speedX === $data->lastSpeedX && $data->speedY === $data->lastSpeedY && $data->lastSpeedZ === $data->speedZ)){ //causer of packet flood is eliminated. break; } - $pk = new SetEntityMotionPacket; - $pk->eid = $data->eid; - $pk->speedX = $data->speedX; - $pk->speedY = $data->speedY; - $pk->speedZ = $data->speedZ; + $pk = new SetEntityMotionPacket; //TODO one packet for all entities if possible + $pk->entities = [[$data->eid, $data->speedX, $data->speedY, $data->speedZ]]; $this->dataPacket($pk); $data->lastSpeedZ = $data->speedZ; $data->lastSpeedY = $data->speedY; diff --git a/src/entity/Creature.php b/src/entity/Creature.php index 586e369f..64e91682 100644 --- a/src/entity/Creature.php +++ b/src/entity/Creature.php @@ -50,10 +50,7 @@ abstract class Creature extends Living{ $player->dataPacket($pk); $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); } diff --git a/src/entity/Entity.php b/src/entity/Entity.php index dbb1acf6..fb8fbb37 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -940,10 +940,7 @@ class Entity extends Position $player->dataPacket($pk); $pk = new SetEntityMotionPacket(); - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); $pk = new PlayerEquipmentPacket(); @@ -968,10 +965,7 @@ class Entity extends Position $player->dataPacket($pk); $pk = new SetEntityMotionPacket(); - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); break; case ENTITY_FALLING: @@ -985,10 +979,7 @@ class Entity extends Position $player->dataPacket($pk); $pk = new SetEntityMotionPacket(); - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); break; } diff --git a/src/entity/object/Arrow.php b/src/entity/object/Arrow.php index 7d85145c..2fb08ae5 100644 --- a/src/entity/object/Arrow.php +++ b/src/entity/object/Arrow.php @@ -54,11 +54,8 @@ class Arrow extends Projectile{ $player->dataPacket($pk); $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); } } -} \ No newline at end of file +} diff --git a/src/entity/object/Minecart.php b/src/entity/object/Minecart.php index d4bc1915..9cf5fe16 100644 --- a/src/entity/object/Minecart.php +++ b/src/entity/object/Minecart.php @@ -41,10 +41,7 @@ class Minecart extends Vehicle{ $player->dataPacket($pk); $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); } diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php index 7626512c..097706bc 100644 --- a/src/entity/object/PrimedTNT.php +++ b/src/entity/object/PrimedTNT.php @@ -43,10 +43,7 @@ class PrimedTNT extends Entity{ $pk->did = 0; $player->dataPacket($pk); $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; + $pk->entities = [[$this->eid, $this->speedX, $this->speedY, $this->speedZ]]; $player->dataPacket($pk); } -} \ No newline at end of file +} diff --git a/src/network/protocol/packet/SetEntityMotionPacket.php b/src/network/protocol/packet/SetEntityMotionPacket.php index 1df1cbbf..30a8b4de 100644 --- a/src/network/protocol/packet/SetEntityMotionPacket.php +++ b/src/network/protocol/packet/SetEntityMotionPacket.php @@ -1,10 +1,7 @@ reset(); - $this->putInt($this->eid); - $this->putShort((int) ($this->speedX * 400)); - $this->putShort((int) ($this->speedY * 400)); - $this->putShort((int) ($this->speedZ * 400)); + $this->putInt(count($this->entities)); + foreach($this->entities as $d){ + $this->putInt($d[0]); + $this->putShort((int) ($d[1]*8000)); + $this->putShort((int) ($d[2]*8000)); + $this->putShort((int) ($d[3]*8000)); + } } -} \ No newline at end of file +}