diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php index 373f3c70..7d6d0c2f 100644 --- a/src/API/PlayerAPI.php +++ b/src/API/PlayerAPI.php @@ -404,7 +404,7 @@ class PlayerAPI{ $pk->z = -256; $pk->yaw = 0; $pk->pitch = 0; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); } } } diff --git a/src/Player.php b/src/Player.php index e72ead92..bb402f38 100755 --- a/src/Player.php +++ b/src/Player.php @@ -130,7 +130,7 @@ class Player{ //$this->server->schedule(20 * 60, [$this, "clearQueue"], [], true); $this->evid[] = $this->server->event("server.close", [$this, "close"]); - console("[DEBUG] New Session started with " . $ip . ":" . $port . ". MTU " . $this->MTU . ", Client ID " . $this->clientID, true, true, 2); + console("[DEBUG] New Session started with $ip:$port. MTU {$this->MTU}, Client ID {$this->clientID}", true, true, 2); } public function __get($name){ @@ -220,7 +220,7 @@ class Player{ $pk->yaw = 0; $pk->pitch = 0; $pk->bodyYaw = 0; - $e->player->dataPacket($pk); + $e->player->dataPacketAlwaysRecover($pk); $pk = new MovePlayerPacket(); $pk->eid = $e->eid; @@ -230,7 +230,7 @@ class Player{ $pk->yaw = 0; $pk->pitch = 0; $pk->bodyYaw = 0; - $this->dataPacket($pk); + $this->dataPacketAlwaysRecover($pk); }else{ $pk = new MoveEntityPacket_PosRot(); @@ -240,7 +240,7 @@ class Player{ $pk->z = -256; $pk->yaw = 0; $pk->pitch = 0; - $this->dataPacket($pk); + $this->dataPacketAlwaysRecover($pk); } } } @@ -266,7 +266,7 @@ class Player{ $pk->z = $e->z; $pk->yaw = $e->yaw; $pk->pitch = $e->pitch; - $this->dataPacket($pk); + $this->dataPacketAlwaysRecover($pk); } } } @@ -284,7 +284,7 @@ class Player{ $pk->z = $player->entity->z; $pk->yaw = $player->entity->yaw; $pk->pitch = $player->entity->pitch; - $this->dataPacket($pk); + $this->dataPacketAlwaysRecover($pk); $pk = new PlayerEquipmentPacket; $pk->eid = $this->eid; @@ -352,13 +352,8 @@ class Player{ * @return array|bool */ public function dataPacket(RakNetDataPacket $packet){ - if($this->connected === false){ - return false; - } - - if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY){ - return; - } + if($this->connected === false) return false; + if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return; $packet->encode(); $len = strlen($packet->buffer) + 1; @@ -378,6 +373,30 @@ class Player{ return []; } + public function dataPacketAlwaysRecover(RakNetDataPacket $packet){ + if($this->connected === false) return false; + if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return; + + $pk = new RakNetPacket(RakNetInfo::DATA_PACKET_0); + $pk->data[] = $packet; + $pk->seqNumber = $this->counter[0]++; + $pk->sendtime = microtime(true); + + $packet->encode(); + $len = strlen($packet->buffer) + 1; + $MTU = $this->MTU - 24; + if($len > $MTU){ + return $this->sendChunkDataPacket($packet); + } + + $packet->messageIndex = $this->counter[3]++; + $packet->reliability = 2; + + $this->send($pk); + $this->packetAlwaysRecoverQueue[$pk->seqNumber] = $pk; + return [$pk->seqNumber]; + } + public function sendChunkDataPacket(RakNetDataPacket $pk){ if($this->connected === false) return false; if(EventHandler::callEvent(new DataPacketSendEvent($this, $pk)) === BaseEvent::DENY) return; @@ -617,6 +636,25 @@ class Player{ } } + public $currentChunk = false; + + public function onChunkReceived($blockX, $blockZ){ + $minX = $blockX; + $maxX = $blockX + 15; + $minZ = $blockZ; + $maxZ = $blockZ + 15; + $tiles = $this->server->query("SELECT ID, x, y, z FROM tiles WHERE level = '{$this->level->getName()}' AND x >= $minX AND x <= $maxX AND z >= $minZ AND z <= $maxZ;"); + $this->lastChunk = false; + if($tiles !== false and $tiles !== true){ + while(($tile = $tiles->fetchArray(SQLITE3_ASSOC)) !== false){ + $tile = $this->server->api->tile->getByID($tile["ID"]); + if($tile instanceof Tile){ + $tile->spawn($this); + } + } + } + } + public function getNextChunk($world){ if($this->connected === false or $world != $this->level){ return false; @@ -632,20 +670,8 @@ class Player{ } if(is_array($this->lastChunk)){ - $minX = $this->lastChunk[0]; - $maxX = $this->lastChunk[0] + 15; - $minZ = $this->lastChunk[1]; - $maxZ = $this->lastChunk[1] + 15; - $tiles = $this->server->query("SELECT ID, x, y, z FROM tiles WHERE level = '{$this->level->getName()}' AND x >= $minX AND x <= $maxX AND z >= $minZ AND z <= $maxZ;"); + $this->onChunkReceived($this->lastChunk[0], $this->lastChunk[1]); $this->lastChunk = false; - if($tiles !== false and $tiles !== true){ - while(($tile = $tiles->fetchArray(SQLITE3_ASSOC)) !== false){ - $tile = $this->server->api->tile->getByID($tile["ID"]); - if($tile instanceof Tile){ - $tile->spawn($this); - } - } - } } $c = key($this->chunksOrder); @@ -681,6 +707,7 @@ class Player{ if($cnt === false){ return false; } + $this->chunkCount = []; foreach($cnt as $i => $count){ $this->chunkCount[$count] = true; @@ -1537,7 +1564,6 @@ class Player{ } public function entityTick(){ if($this->isSleeping) ++$this->sleepingTime; - if($this->server->difficulty == 0 && $this->entity->counter % (20 * 15) == 0){ if($this->entity->health < 20 && $this->entity->health > 0){ $this->entity->setHealth(min(20, $this->entity->health + 1), "regeneration"); @@ -2864,7 +2890,7 @@ class Player{ case RakNetInfo::NACK: foreach($packet->packets as $count){ if(isset($this->packetAlwaysRecoverQueue[$count])){ - $this->packetAlwaysRecoverQueue[$count]->sendtime = 0; //forces resend next time it will be checked + $this->resendQueue[$count] = $this->packetAlwaysRecoverQueue[$count]; }else if(isset($this->recoveryQueue[$count])){ $this->resendQueue[$count] =& $this->recoveryQueue[$count]; $this->lag[] = $time - $this->recoveryQueue[$count]->sendtime; diff --git a/src/entity/Creature.php b/src/entity/Creature.php index a8e97972..d6e50024 100644 --- a/src/entity/Creature.php +++ b/src/entity/Creature.php @@ -72,7 +72,7 @@ abstract class Creature extends Living{ $pk->yaw = $this->yaw; $pk->pitch = $this->pitch; $pk->metadata = $this->getMetadata(); - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); $pk = new SetEntityMotionPacket; $pk->eid = $this->eid; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index e4f5383c..0bf3960b 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1125,14 +1125,7 @@ class Entity extends Position $pk->itemID = 0; $pk->itemAuxValue = 0; $pk->metadata = $this->getMetadata(); - $player->directDataPacket($pk, 2, true); - - $pk = new SetEntityMotionPacket(); - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk, 2, true); $pk = new PlayerEquipmentPacket(); $pk->eid = $this->eid; @@ -1142,18 +1135,6 @@ class Entity extends Position $player->dataPacket($pk); $this->player->sendArmor($player); break; - case ENTITY_FALLING: - $pk = new AddEntityPacket(); - $pk->eid = $this->eid; - $pk->type = $this->type; - $pk->x = $this->x; - $pk->y = $this->y; - $pk->z = $this->z; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; - $pk->did = -$this->data["Tile"]; - $player->dataPacket($pk); } if($this->linkedEntity != 0 && $this->isRider){ @@ -1563,6 +1544,7 @@ class Entity extends Position "health" => $health, "cause" => $cause )) !== false or $force === true){ + $this->health = min(127, max(- 127, $health)); if($harm === true && $allowHarm){ $pk = new EntityEventPacket; @@ -1578,6 +1560,7 @@ class Entity extends Position } } } + if($this->player instanceof Player){ $pk = new SetHealthPacket(); $pk->health = $this->health; diff --git a/src/entity/Projectile.php b/src/entity/Projectile.php index 3c37424b..534d5473 100644 --- a/src/entity/Projectile.php +++ b/src/entity/Projectile.php @@ -210,7 +210,7 @@ abstract class Projectile extends Entity{ $pk->speedY = $this->speedY; $pk->speedZ = $this->speedZ; $pk->did = 0; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); } } \ No newline at end of file diff --git a/src/entity/object/Arrow.php b/src/entity/object/Arrow.php index d671113e..216afc49 100644 --- a/src/entity/object/Arrow.php +++ b/src/entity/object/Arrow.php @@ -272,7 +272,7 @@ class Arrow extends Entity{ $pk->speedX = $this->speedX; $pk->speedY = $this->speedY; $pk->speedZ = $this->speedZ; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); } } } diff --git a/src/entity/object/FallingSand.php b/src/entity/object/FallingSand.php index 81b6fa9b..ce3ddfe7 100644 --- a/src/entity/object/FallingSand.php +++ b/src/entity/object/FallingSand.php @@ -19,6 +19,20 @@ class FallingSand extends Entity{ public function isPickable(){ return !$this->dead; } + public function spawn($player) + { + $pk = new AddEntityPacket(); + $pk->eid = $this->eid; + $pk->type = $this->type; + $pk->x = $this->x; + $pk->y = $this->y; + $pk->z = $this->z; + $pk->speedX = $this->speedX; + $pk->speedY = $this->speedY; + $pk->speedZ = $this->speedZ; + $pk->did = -$this->data["Tile"]; + $player->dataPacketAlwaysRecover($pk); + } public function update($now){ if($this->closed) return; diff --git a/src/entity/object/ItemEntity.php b/src/entity/object/ItemEntity.php index 9af57bee..d4be3e7f 100644 --- a/src/entity/object/ItemEntity.php +++ b/src/entity/object/ItemEntity.php @@ -54,7 +54,7 @@ class ItemEntity extends Entity{ $pk->roll = 0; $pk->item = BlockAPI::getItem($this->itemID, $this->meta, $this->stack); $pk->metadata = $this->getMetadata(); - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); $pk = new SetEntityMotionPacket(); $pk->eid = $this->eid; diff --git a/src/entity/object/Minecart.php b/src/entity/object/Minecart.php index f10ab47e..fa39affa 100644 --- a/src/entity/object/Minecart.php +++ b/src/entity/object/Minecart.php @@ -435,8 +435,8 @@ class Minecart extends Vehicle{ $pk->z = $this->z; $pk->yaw = $this->yaw; $pk->pitch = $this->pitch; - $player->dataPacket($pk); - + $player->dataPacketAlwaysRecover($pk); + $pk = new SetEntityMotionPacket; $pk->eid = $this->eid; $pk->speedX = $this->speedX; diff --git a/src/entity/object/Painting.php b/src/entity/object/Painting.php index 9b2aa8b5..0e64a00a 100644 --- a/src/entity/object/Painting.php +++ b/src/entity/object/Painting.php @@ -205,6 +205,6 @@ class Painting extends Entity{ $pk->z = (int) $this->zPos; $pk->direction = $this->direction; $pk->title = $this->motive; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); } } diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php index f88adb7e..3bc5f03d 100644 --- a/src/entity/object/PrimedTNT.php +++ b/src/entity/object/PrimedTNT.php @@ -76,6 +76,6 @@ class PrimedTNT extends Entity{ $pk->speedX = $this->speedX; $pk->speedY = $this->speedY; $pk->speedZ = $this->speedZ; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); } } \ No newline at end of file diff --git a/src/material/block/misc/BedBlock.php b/src/material/block/misc/BedBlock.php index dcfb3729..d94bbb08 100644 --- a/src/material/block/misc/BedBlock.php +++ b/src/material/block/misc/BedBlock.php @@ -76,9 +76,7 @@ class BedBlock extends TransparentBlock{ public function onActivate(Item $item, Player $player){ if(ServerAPI::request()->api->time->getPhase($player->level) !== "night"){ - $pk = new ChatPacket; - $pk->message = "You can only sleep at night"; - $player->dataPacket($pk); + $player->sendChat("You can only sleep at night"); return true; } @@ -98,17 +96,13 @@ class BedBlock extends TransparentBlock{ }elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){ $b = $blockWest; }else{ - $pk = new ChatPacket; - $pk->message = "This bed is incomplete"; - $player->dataPacket($pk); + $player->sendChat("This bed is incomplete"); return true; } } if($player->sleepOn($b) === false){ - $pk = new ChatPacket; - $pk->message = "This bed is occupied"; - $player->dataPacket($pk); + $player->sendChat("This bed is occupied"); } return true; } diff --git a/src/world/Tile.php b/src/world/Tile.php index e270a68b..e482384c 100644 --- a/src/world/Tile.php +++ b/src/world/Tile.php @@ -375,7 +375,7 @@ class Tile extends Position{ $pk->y = $this->y; $pk->z = $this->z; $pk->namedtag = $nbt->binary; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); break; case TILE_SIGN: $nbt = new NBT(); @@ -420,7 +420,7 @@ class Tile extends Position{ $pk->y = $this->y; $pk->z = $this->z; $pk->namedtag = $nbt->binary; - $player->dataPacket($pk); + $player->dataPacketAlwaysRecover($pk); break; } }