diff --git a/src/Player.php b/src/Player.php index 5b99f7a3..63bfc393 100755 --- a/src/Player.php +++ b/src/Player.php @@ -433,7 +433,7 @@ class Player{ $pk->speedX = 0; $pk->speedY = 0; $pk->speedZ = 0; - $this->entityQueueDataPacket($pk); + $this->dataPacketAlwaysRecover($pk); $pk = new MovePlayerPacket; $pk->eid = $this->eid; @@ -443,7 +443,7 @@ class Player{ $pk->bodyYaw = $yaw; $pk->pitch = $pitch; $pk->yaw = $yaw; - $this->entityQueueDataPacket($pk); + $this->dataPacketAlwaysRecover($pk); } /** @@ -1439,6 +1439,10 @@ class Player{ } public function handlePacketQueues(){ + if($this->server->ticks % 40 == 0){ //2s + $this->sendPing(); + } + if($this->connected === false){ return false; } @@ -1552,7 +1556,9 @@ class Player{ } if(($resendCnt = count($this->resendQueue)) > 0){ + $maxResendCnt = $resendCnt > 25 ? 25 : $resendCnt; foreach($this->resendQueue as $count => $data){ + if(--$maxResendCnt) break; unset($this->resendQueue[$count]); $this->packetStats[1]++; $this->lag[] = $time - $data->sendtime; @@ -3296,6 +3302,7 @@ class Player{ break; case RakNetInfo::ACK: + //if(mt_rand(0, 99) > 50) break; foreach($packet->packets as $count){ if(isset($this->packetAlwaysRecoverQueue[$count])){ $this->lag[] = $time - $this->packetAlwaysRecoverQueue[$count]->sendtime; diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 2a0afd75..39a8523c 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -3,11 +3,16 @@ class PocketMinecraftServer{ public $tCnt, $ticks; - public $extraprops, $serverID, $interface, $database, $version, $invisible, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $port, $saveEnabled; + public $extraprops, $serverID, $interface, $database, $version, $invisible, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $eidCnt, $custom, $description, $motd, $port, $saveEnabled; /** * @var ServerAPI */ public $api; + /** + * @var Player[] + */ + public $clients; + private $serverip, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $memoryStats, $async = [], $asyncID = 0; public $doTick, $levelData, $tiles, $entities, $schedule, $scheduleCnt, $whitelist, $spawn, $difficulty, $stop, $asyncThread; @@ -631,9 +636,6 @@ class PocketMinecraftServer{ foreach($this->clients as $client){ $client->handlePacketQueues(); - if($this->ticks % 40 == 0){ //2s - $client->sendPing(); - } } foreach($this->api->level->levels as $l){ diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 975fb90c..36104762 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -999,7 +999,9 @@ class Entity extends Position $pk->yaw = $this->yaw; $pk->pitch = $this->pitch; $pk->bodyYaw = $this->yaw; - $this->server->api->player->broadcastPacket($players, $pk); + foreach($players as $player){ + if($player->hasEntity($this)) $player->entityQueueDataPacket(clone $pk); + } } } } @@ -1602,14 +1604,14 @@ class Entity extends Position $pk->eid = $this->eid; $pk->event = EntityEventPacket::ENTITY_DAMAGE; foreach($this->level->players as $p){ - $p->entityQueueDataPacket(clone $pk); + if($p->hasEntity($this)) $p->entityQueueDataPacket(clone $pk); } } if($this->player instanceof Player){ $pk = new SetHealthPacket(); $pk->health = $this->health; - $this->player->entityQueueDataPacket($pk); + if($this->player->hasEntity($this)) $this->player->entityQueueDataPacket($pk); } if($this->health <= 0 and $this->dead === false){ $this->makeDead($cause); @@ -1646,12 +1648,16 @@ class Entity extends Position $pk->z = -256; $pk->yaw = 0; $pk->pitch = 0; - $this->server->api->player->broadcastPacket($this->level->players, $pk); + foreach($this->level->players as $player){ + if($player->hasEntity($this)) $player->entityQueueDataPacket(clone $pk); + } }else{ $pk = new EntityEventPacket; $pk->eid = $this->eid; $pk->event = EntityEventPacket::ENTITY_DEAD; - $this->server->api->player->broadcastPacket($this->level->players, $pk); + foreach($this->level->players as $player){ + if($player->hasEntity($this)) $player->entityQueueDataPacket(clone $pk); + } } if($this->player instanceof Player){ diff --git a/src/entity/ai/tasks/TaskEatTileGoal.php b/src/entity/ai/tasks/TaskEatTileGoal.php index 5af5d21e..8bc3766e 100644 --- a/src/entity/ai/tasks/TaskEatTileGoal.php +++ b/src/entity/ai/tasks/TaskEatTileGoal.php @@ -5,7 +5,9 @@ class TaskEatTileGoal extends TaskBase public function onStart(EntityAI $ai) { $this->selfCounter = 40; - $ai->entity->server->api->player->broadcastPacket($ai->entity->level->players, new EntityEventPacket($ai->entity->eid, EntityEventPacket::ENTITY_ANIM_10)); + foreach($ai->entity->level->players as $player){ + if($player->hasEntity($ai->entity)) $player->entityQueueDataPacket(new EntityEventPacket($ai->entity->eid, EntityEventPacket::ENTITY_ANIM_10)); + } } public function onEnd(EntityAI $ai) diff --git a/src/entity/object/Arrow.php b/src/entity/object/Arrow.php index 5915c4cf..4b26a8a0 100644 --- a/src/entity/object/Arrow.php +++ b/src/entity/object/Arrow.php @@ -47,16 +47,6 @@ class Arrow extends Entity{ $data["shotByPlayer"] = $this->shotByPlayer; return $data; } - public function handleUpdate(){ - $pk = new MoveEntityPacket_PosRot; - $pk->eid = $this->eid; - $pk->x = $this->x; - $pk->y = $this->y; - $pk->z = $this->z; - $pk->yaw = $this->yaw; - $pk->pitch = $this->pitch; - $this->server->api->player->broadcastPacket($this->level->players, $pk); - } public function shoot($d, $d1, $d2, $f, $f1){ //original name from 0.8.1 IDA decompilation, var names are taken from b1.7.3 $f2 = sqrt($d * $d + $d1 * $d1 + $d2 * $d2); diff --git a/src/material/block/DoorBlock.php b/src/material/block/DoorBlock.php index dfdc7bce..a1634cde 100644 --- a/src/material/block/DoorBlock.php +++ b/src/material/block/DoorBlock.php @@ -208,7 +208,7 @@ class DoorBlock extends TransparentBlock{ $pk->z = $this->z; $pk->evid = 1003; $pk->data = 0; - ServerAPI::request()->api->player->broadcastPacket($players, $pk); + ServerAPI::request()->api->player->broadcastPacket($players, $pk); //TODO use block queue? return true; } return false; diff --git a/src/material/block/nonfull/FenceGateBlock.php b/src/material/block/nonfull/FenceGateBlock.php index 977f346c..74d8c59e 100644 --- a/src/material/block/nonfull/FenceGateBlock.php +++ b/src/material/block/nonfull/FenceGateBlock.php @@ -75,7 +75,7 @@ class FenceGateBlock extends TransparentBlock{ $pk->z = $this->z; $pk->evid = 1003; $pk->data = 0; - ServerAPI::request()->api->player->broadcastPacket($players, $pk); + ServerAPI::request()->api->player->broadcastPacket($players, $pk); //TODO use blok queue? return true; } }