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

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-28 18:02:09 +01:00
parent c7fd3eb725 37b050f864
commit b5d2402c9b
20 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,49 +407,31 @@ class Level implements ChunkManager, Metadatable{
public function addSound(Sound $sound, array $players = null){
$pk = $sound->encode();
if(!is_array($pk)){
$pk = [$pk];
}
if($players === null){
if($pk !== null){
if(!is_array($pk)){
$this->addChunkPacket($sound->x >> 4, $sound->z >> 4, $pk);
}else{
foreach($pk as $e){
$this->addChunkPacket($sound->x >> 4, $sound->z >> 4, $e);
}
}
foreach($pk as $e){
$this->addChunkPacket($sound->x >> 4, $sound->z >> 4, $e);
}
}else{
if($pk !== null){
if(!is_array($pk)){
$this->server->broadcastPacket($players, $pk);
}else{
$this->server->batchPackets($players, $pk, false);
}
}
$this->server->batchPackets($players, $pk, false);
}
}
public function addParticle(Particle $particle, array $players = null){
$pk = $particle->encode();
if(!is_array($pk)){
$pk = [$pk];
}
if($players === null){
if($pk !== null){
if(!is_array($pk)){
$this->addChunkPacket($particle->x >> 4, $particle->z >> 4, $pk);
}else{
foreach($pk as $e){
$this->addChunkPacket($particle->x >> 4, $particle->z >> 4, $e);
}
}
foreach($pk as $e){
$this->addChunkPacket($particle->x >> 4, $particle->z >> 4, $e);
}
}else{
if($pk !== null){
if(!is_array($pk)){
$this->server->broadcastPacket($players, $pk);
}else{
$this->server->batchPackets($players, $pk, false);
}
}
$this->server->batchPackets($players, $pk, false);
}
}
@ -1637,10 +1619,8 @@ class Level implements ChunkManager, Metadatable{
}
$above = $this->getBlock(new Vector3($target->x, $target->y + 1, $target->z));
if($above !== null){
if($above->getId() === Item::FIRE){
$this->setBlock($above, BlockFactory::get(Block::AIR), true);
}
if($above->getId() === Item::FIRE){
$this->setBlock($above, BlockFactory::get(Block::AIR), true);
}
if($createParticles){