mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.4' into release/3.5

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-12-14 09:39:21 +00:00
parent dbeceb02f9 d4fe1b8ece
commit c05697f506
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/pocketmine/level/Level.php
View File

@ -451,13 +451,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->batchPackets($players, $pk, false);
}
}else{
$this->server->batchPackets($players, $pk, false);
}
}
@ -466,13 +467,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->batchPackets($players, $pk, false);
}
}else{
$this->server->batchPackets($players, $pk, false);
}
}