Actually merge branch 'release/3.4' this time

This commit is contained in:
Dylan K. Taylor
2018-10-19 15:35:23 +01:00
18 changed files with 156 additions and 76 deletions

View File

@ -846,7 +846,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
/* we don't use Server->updatePlayerListData() because that uses batches, which could cause race conditions in async compression mode */
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_ADD;
$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->getName(), 0, $this->skin)];
$pk->entries = [PlayerListEntry::createAdditionEntry($this->uuid, $this->id, $this->getName(), $this->skin)];
$player->sendDataPacket($pk);
}