Merge branch 'release/3.5'

This commit is contained in:
Dylan K. Taylor
2018-12-14 10:03:36 +00:00
3 changed files with 20 additions and 15 deletions

View File

@ -455,13 +455,14 @@ class Level implements ChunkManager, Metadatable{
if(!is_array($pk)){
$pk = [$pk];
}
if($players === null){
foreach($pk as $e){
$this->broadcastPacketToViewers($sound, $e);
if(!empty($pk)){
if($players === null){
foreach($pk as $e){
$this->broadcastPacketToViewers($sound, $e);
}
}else{
$this->server->broadcastPackets($players, $pk);
}
}else{
$this->server->broadcastPackets($players, $pk);
}
}
@ -470,13 +471,14 @@ class Level implements ChunkManager, Metadatable{
if(!is_array($pk)){
$pk = [$pk];
}
if($players === null){
foreach($pk as $e){
$this->broadcastPacketToViewers($particle, $e);
if(!empty($pk)){
if($players === null){
foreach($pk as $e){
$this->broadcastPacketToViewers($particle, $e);
}
}else{
$this->server->broadcastPackets($players, $pk);
}
}else{
$this->server->broadcastPackets($players, $pk);
}
}