mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 11:39:43 +00:00
client-server sync when using items
This commit is contained in:
parent
70e4355d61
commit
728b8f6d2e
3 changed files with 68 additions and 7 deletions
|
|
@ -68,9 +68,10 @@ class Player{
|
|||
private $chunkCount = [];
|
||||
private $received = [];
|
||||
public $cratingItems;
|
||||
|
||||
public $sleepingTime = 0;
|
||||
|
||||
public $blockSendQueue;
|
||||
public $blockSendQueueLength = 0;
|
||||
/**
|
||||
* @param integer $clientID
|
||||
* @param string $ip
|
||||
|
|
@ -97,6 +98,8 @@ class Player{
|
|||
$this->packetStats = [0, 0];
|
||||
$this->buffer = new RakNetPacket(RakNetInfo::DATA_PACKET_0);
|
||||
$this->buffer->data = [];
|
||||
$this->blockSendQueue = new RakNetPacket(RakNetInfo::DATA_PACKET_0);
|
||||
$this->blockSendQueue->data = [];
|
||||
$this->server->schedule(1, [$this, "handlePacketQueues"], [], true);
|
||||
$this->server->schedule(20 * 60, [$this, "clearQueue"], [], true);
|
||||
$this->evid[] = $this->server->event("server.close", [$this, "close"]);
|
||||
|
|
@ -248,7 +251,23 @@ class Player{
|
|||
$pk->teleport = true;
|
||||
$this->dataPacket($pk);
|
||||
}
|
||||
|
||||
public function addToBlockSendQueue(RakNetDataPacket $packet){
|
||||
if($this->connected === false) return false;
|
||||
|
||||
$packet->encode();
|
||||
$len = strlen($packet->buffer) + 1;
|
||||
$MTU = $this->MTU - 24;
|
||||
|
||||
|
||||
if(($this->blockSendQueueLength + $len) >= $MTU){
|
||||
$this->sendBlockUpdateQueue();
|
||||
}
|
||||
|
||||
$packet->messageIndex = $this->counter[3]++;
|
||||
$packet->reliability = 2;
|
||||
@$this->blockSendQueue->data[] = $packet;
|
||||
$this->blockSendQueueLength += 6 + $len;
|
||||
}
|
||||
/**
|
||||
* @param integer $id
|
||||
* @param array $data
|
||||
|
|
@ -325,7 +344,17 @@ class Player{
|
|||
$this->bandwidthRaw += $this->server->send($packet);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function sendBlockUpdateQueue(){
|
||||
if($this->blockSendQueueLength > 0 and $this->blockSendQueue instanceof RakNetPacket){
|
||||
$this->blockSendQueue->seqNumber = $this->counter[0]++;
|
||||
$this->send($this->blockSendQueue);
|
||||
}
|
||||
$this->blockSendQueueLength = 0;
|
||||
$this->blockSendQueue = new RakNetPacket(RakNetInfo::DATA_PACKET_0);
|
||||
$this->blockSendQueue->data = [];
|
||||
}
|
||||
public function sendBuffer(){
|
||||
if($this->bufferLen > 0 and $this->buffer instanceof RakNetPacket){
|
||||
$this->buffer->seqNumber = $this->counter[0]++;
|
||||
|
|
@ -1622,10 +1651,10 @@ class Player{
|
|||
//$this->lastChunk = [$packet->chunkX, $packet->chunkZ];
|
||||
break;
|
||||
case ProtocolInfo::UPDATE_BLOCK_PACKET:
|
||||
if($this->gamemode & 0x01 === 0){
|
||||
if($this->gamemode & 0x01 === 1){
|
||||
$this->level->setBlock(new Vector3($packet->x, $packet->y, $packet->z), BlockAPI::get($packet->block, $packet->meta));
|
||||
}
|
||||
|
||||
$this->level->resendBlocksToPlayers[$this->CID]["{$packet->x}.{$packet->y}.{$packet->z}"] = true; //bad client i hate u
|
||||
break;
|
||||
case ProtocolInfo::USE_ITEM_PACKET:
|
||||
if(!($this->entity instanceof Entity)){
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@ class UpdateBlockPacket extends RakNetDataPacket{
|
|||
}
|
||||
|
||||
public function decode(){
|
||||
$this->x = $this->getInt();
|
||||
$this->z = $this->getInt();
|
||||
$this->y = $this->getByte();
|
||||
$this->block = $this->getByte();
|
||||
$this->meta = $this->getByte();
|
||||
}
|
||||
|
||||
public function encode(){
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class Level{
|
|||
public $entityList;
|
||||
public $tiles, $blockUpdates, $nextSave, $players = [], $level, $mobSpawner;
|
||||
public $time, $startCheck, $startTime, $server, $name, $usedChunks, $changedBlocks, $changedCount, $stopTime;
|
||||
|
||||
public $resendBlocksToPlayers = [];
|
||||
public $generator;
|
||||
public function __construct(PMFLevel $level, Config $entities, Config $tiles, Config $blockUpdates, $name){
|
||||
$this->server = ServerAPI::request();
|
||||
|
|
@ -452,7 +452,34 @@ class Level{
|
|||
$this->level->unloadChunk($xz[0], $xz[1]);
|
||||
unset($this->level->fakeLoaded[$ind]);
|
||||
}
|
||||
|
||||
foreach($this->resendBlocksToPlayers as $playerCID => $blockz){
|
||||
/**
|
||||
* @var Player $player
|
||||
*/
|
||||
$player = $this->server->clients[$playerCID] ?? false;
|
||||
if($player instanceof Player){
|
||||
foreach($blockz as $xyz => $_){
|
||||
$xyzz = explode(".", $xyz);
|
||||
if(count($xyzz) == 3){
|
||||
$x = (int) $xyzz[0];
|
||||
$y = (int) $xyzz[1];
|
||||
$z = (int) $xyzz[2];
|
||||
$idm = $this->level->getBlock($x, $y, $z);
|
||||
//$player->addToBlockSendQueue(new UpdateBlockPacket($x, $y, $z, $idm[0], $idm[1]));
|
||||
$pk = new UpdateBlockPacket;
|
||||
$pk->x = $x;
|
||||
$pk->y = $y;
|
||||
$pk->z = $z;
|
||||
$pk->block = $idm[0] & 0xff;
|
||||
$pk->meta = $idm[1] & 0xff;
|
||||
$player->addToBlockSendQueue($pk);
|
||||
}
|
||||
unset($blockz[$xyz]);
|
||||
}
|
||||
$player->sendBlockUpdateQueue();
|
||||
}
|
||||
unset($this->resendBlocksToPlayers[$playerCID]);
|
||||
}
|
||||
}
|
||||
|
||||
public function setBlock(Vector3 $pos, Block $block, $update = true, $tiles = false, $direct = false){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue